Move resource limiting to import-and-analyse script itself.

[build-farm.git] / import-and-analyse.py

diff --git a/import-and-analyse.py b/import-and-analyse.py
index f6f0c2cb262f3e018c840d9d55c780f02641c311..39ab3a8fd32a1d5111c178dd54702a9e29ab2e60 100755 (executable)
--- a/import-and-analyse.py
+++ b/import-and-analyse.py
@@ -10,11 +10,16 @@ some mail chastising the possible culprits when the build fails, based
 on recent commits.
 """
 
-from buildfarm import data
+from buildfarm.build import (
+    MissingRevisionInfo,
+    NoSuchBuildError,
+    )
 from buildfarm.sqldb import StormCachingBuildFarm
+from buildfarm.web import build_uri
 from email.mime.text import MIMEText
 import logging
 import optparse
+import resource
 import smtplib
 
 parser = optparse.OptionParser("import-and-analyse [options]")
@@ -23,18 +28,21 @@ parser.add_option("--verbose", help="Be verbose", action="count")
 
 (opts, args) = parser.parse_args()
 
+resource.setrlimit(resource.RLIMIT_RSS, (300000, 300000))
+resource.setrlimit(resource.RLIMIT_DATA, (300000, 300000))
+
 buildfarm = StormCachingBuildFarm(timeout=40.0)
 
 smtp = smtplib.SMTP()
 smtp.connect()
 
-def check_and_send_mails(tree, host, compiler, cur, old):
-    t = buildfarm.trees[tree]
+def check_and_send_mails(cur, old):
+    t = buildfarm.trees[cur.tree]
 
-    (cur_rev, cur_rev_timestamp) = cur.revision_details()
+    cur_rev = cur.revision_details()
     cur_status = cur.status()
 
-    (old_rev, old_rev_timestamp) = old.revision_details()
+    old_rev = old.revision_details()
     old_status = old.status()
 
     if not cur_status.regressed_since(old_status):
@@ -64,15 +72,13 @@ Tree %(tree)s is %(scm)s branch %(branch)s.
 Build status for new revision %(cur_rev)s is %(cur_status)s
 Build status for old revision %(old_rev)s was %(old_status)s
 
-See http://build.samba.org/?function=View+Build;host=%(host)s;tree=%(tree)s;compiler=%(compiler)s
+See %(build_link)s
 
 The build may have been broken by one of the following commits:
 
 %(change_log)s
     """ % {
-        "tree": tree.encode("utf-8"),
-        "host": host.encode("utf-8"),
-        "compiler": compiler.encode("utf-8"),
+        "tree": cur.tree, "host": cur.host, "compiler": cur.compiler,
         "change_log": change_log,
         "scm": t.scm,
         "branch": t.branch,
@@ -80,10 +86,11 @@ The build may have been broken by one of the following commits:
         "old_rev": old_rev,
         "cur_status": cur_status,
         "old_status": old_status,
+        "build_link": build_uri("http://build.samba.org/build.cgi", cur)
         }
 
     msg = MIMEText(body)
-    msg["Subject"] = "BUILD of %s:%s BROKEN on %s with %s AT REVISION %s" % (tree, t.branch, host, compiler, cur_rev)
+    msg["Subject"] = "BUILD of %s:%s BROKEN on %s with %s AT REVISION %s" % (cur.tree, t.branch, cur.host, cur.compiler, cur_rev)
     msg["From"] = "\"Build Farm\" <build@samba.org>"
     msg["To"] = ",".join(recipients)
     if not opts.dry_run:
@@ -97,15 +104,16 @@ for build in buildfarm.get_new_builds():
         continue
 
     if not opts.dry_run:
+        old_build = build
         try:
-            build = buildfarm.builds.upload_build(build)
-        except data.MissingRevisionInfo:
+            build = buildfarm.builds.upload_build(old_build)
+        except MissingRevisionInfo:
             print "No revision info in %r, skipping" % build
             continue
 
     try:
-        (rev, rev_timestamp) = build.revision_details()
-    except data.MissingRevisionInfo:
+        rev = build.revision_details()
+    except MissingRevisionInfo:
         print "No revision info in %r, skipping" % build
         continue
 
@@ -119,7 +127,7 @@ for build in buildfarm.get_new_builds():
             prev_rev = buildfarm.builds.get_latest_revision(build.tree, build.host, build.compiler)
         else:
             prev_rev = buildfarm.builds.get_previous_revision(build.tree, build.host, build.compiler, rev)
-    except data.NoSuchBuildError:
+    except NoSuchBuildError:
         if opts.verbose >= 1:
             print "Unable to find previous build for %s,%s,%s" % (build.tree, build.host, build.compiler)
         # Can't send a nastygram until there are 2 builds..
@@ -127,15 +135,14 @@ for build in buildfarm.get_new_builds():
         try:
             assert prev_rev is not None
             prev_build = buildfarm.builds.get_build(build.tree, build.host, build.compiler, prev_rev)
-        except data.NoSuchBuildError:
+        except NoSuchBuildError:
             if opts.verbose >= 1:
                 print "Previous build %s has disappeared" % prev_build
         else:
-            check_and_send_mails(build.tree, build.host, build.compiler, build, prev_build)
+            check_and_send_mails(build, prev_build)
 
     if not opts.dry_run:
-        # When the new web script is introduced, kill the build here:
-        # build.remove()
+        old_build.remove()
         buildfarm.commit()
 
 smtp.quit()