Merge lp:~al-maisan/launchpad/observe-virtualized-507323 into lp:launchpad/db-devel

[Muharem Hrnjadovic]

[Muharem Hrnjadovic (al-maisan)]

Hello there!

The selection of candidate jobs for idle builders in the build farm compares
the platform settings (processor/virtualized) for these.
In cases where a potential candidate job does not care about virtualization it
should only be considered for virtualized builders.
This is a security precaution preventing the execution of untrusted code on
native builders.

Please note that all _findBuildCandidate() tests (we have a pretty extensive
test coverage of the build farm candidate job selection) pass.

Test to run:

    bin/test -vv -t build

No "make lint" errors or warnings.

[Paul Hummer (rockstar)]

review: Approve (code)

=== modified file 'lib/lp/buildmaster/model/builder.py'
--- lib/lp/buildmaster/model/builder.py	2010-01-14 20:50:22 +0000
+++ lib/lp/buildmaster/model/builder.py	2010-01-14 20:50:23 +0000
@@ -443,13 +443,22 @@
                 buildqueue.job = job.id
                 AND job.status = %s
                 AND (
-                    (buildqueue.processor = %s
-                     AND buildqueue.virtualized = %s)
-                   OR
-                    (buildqueue.processor IS NULL
-                     AND buildqueue.virtualized IS NULL))
+                    -- The processor values either match or the candidate
+                    -- job is processor-independent.
+                    buildqueue.processor = %s OR 
+                    buildqueue.processor IS NULL)
+                AND (
+                    -- The virtualized values either match or the candidate
+                    -- job does not care about virtualization and the idle
+                    -- builder *is* virtualized (the latter is a security
+                    -- precaution preventing the execution of untrusted code
+                    -- on native builders).
+                    buildqueue.virtualized = %s OR
+                    (buildqueue.virtualized IS NULL AND %s = TRUE))
                 AND buildqueue.builder IS NULL
-        """ % sqlvalues(JobStatus.WAITING, self.processor, self.virtualized)
+        """ % sqlvalues(
+            JobStatus.WAITING, self.processor, self.virtualized,
+            self.virtualized)
         order_clause = " ORDER BY buildqueue.lastscore DESC, buildqueue.id"
 
         extra_tables = set()