Merge lp:~michael.nelson/launchpad/499421-dont-grind-bm-to-a-halt into lp:launchpad

[Michael Nelson]

IBuildQueueSet.getActiveBuildJobs() returns only active build jobs that have an associated Builder (so that bug 499421 won't cause the buildd-manager won't try to update it.)

[Michael Nelson (michael.nelson)]

This branch ensures that IBuildQueueSet.getActiveBuildJobs() returns only active build jobs that have an associated Builder.

It's related to bug 499421, and just ensures that when we do get into this situation (an active build without a builder), the buildd-manager doesn't try to updated it (and hence fall over).

Tests
=====
bin/test -vvt test_getActiveBuildJobs_no_builder_bug499421

We will need to QA this on dogfood.

[Eleanor Berger (intellectronica)]

review: Approve (code)

[Michael Nelson (michael.nelson)]

I have QA'd this on dogfood by:

0. Patching the codebase to explicitly revert fix on dogfood
1. Adding some new sources to the queue for building,
2. Running the buildd-manager to see the new build dispatched,
3. Pausing the buildd-manager, then in a harness getting the current build and manually setting the builder attribute to None.
4. Restarting buildd-manager and verifying the exact error as seen in production (http://pastebin.ubuntu.com/383523/)
5. Stopping the buildd-manager again,
7. Reverting the codebase enabling the fix
8. Restarting the buildd-manager and confirming that it carries on scanning as usual without error.

[Björn Tillenius (bjornt)]

This looks good from a CP point of view. I mentioned on IRC that re-using the same bug for tracking a CP and the long-term issue would be confusing, so Michael will file a new bug for the XXX comment, and update devel with the new bug number.

review: Approve (release-critical)

=== modified file 'lib/lp/soyuz/model/buildqueue.py'
--- lib/lp/soyuz/model/buildqueue.py	2010-02-02 14:01:14 +0000
+++ lib/lp/soyuz/model/buildqueue.py	2010-02-23 06:10:32 +0000
@@ -506,6 +506,9 @@
         result_set = store.find(
             BuildQueue,
             BuildQueue.job == Job.id,
+            # XXX Michael Nelson 2010-02-22 bug=499421
+            # Avoid corrupt build jobs where the builder is None.
+            BuildQueue.builder != None,
             # status is a property. Let's use _status.
             Job._status == JobStatus.RUNNING,
             Job.date_started != None)

=== modified file 'lib/lp/soyuz/tests/test_buildqueue.py'
--- lib/lp/soyuz/tests/test_buildqueue.py	2010-02-22 16:57:43 +0000
+++ lib/lp/soyuz/tests/test_buildqueue.py	2010-02-23 06:10:32 +0000
@@ -177,6 +177,19 @@
         buildqueue = BuildQueue(job=job.id)
         self.assertEquals(buildqueue, self.buildqueueset.getByJob(job))
 
+    def test_getActiveBuildJobs_no_builder_bug499421(self):
+        # An active build queue item that does not have a builder will
+        # not be included in the results and so will not block the
+        # buildd-manager.
+        active_jobs = self.buildqueueset.getActiveBuildJobs()
+        self.assertEqual(1, active_jobs.count())
+        active_job = active_jobs[0]
+        active_job.builder = None
+        self.assertTrue(
+            self.buildqueueset.getActiveBuildJobs().is_empty(),
+            "An active build job must have a builder.")
+
+
 
 class TestBuildQueueBase(TestCaseWithFactory):
     """Setup the test publisher and some builders."""
@@ -248,7 +261,10 @@
 
         # hppa native
         self.builders[(self.hppa_proc.id, False)] = [
-            self.h5, self.h6, self.h7]
+            self.h5,
+            self.h6,
+            self.h7,
+            ]
         # hppa virtual
         self.builders[(self.hppa_proc.id, True)] = [
             self.h1, self.h2, self.h3, self.h4]