Changeset 65031 in vbox for trunk

Timestamp:

Dec 29, 2016 10:27:33 PM (8 years ago)

Author:

vboxsync

Message:

testmanager/schedulerbase.py: Fixed problem getting stuck doing nothing when a scheduling group is out of new builds to test.

File:

• trunk/src/VBox/ValidationKit/testmanager/core/schedulerbase.py (modified) (5 diffs)

trunk/src/VBox/ValidationKit/testmanager/core/schedulerbase.py

@@ -1291 +1291 @@
 
     @staticmethod
-    def _pickSchedGroup(oTestBoxDataEx, iWorkItem):
+    def _pickSchedGroup(oTestBoxDataEx, iWorkItem, dIgnoreSchedGroupIds):
         """
         Picks the next scheduling group for the given testbox.
@@ -1297 +1297 @@
         if len(oTestBoxDataEx.aoInSchedGroups) == 1:
             oSchedGroup = oTestBoxDataEx.aoInSchedGroups[0].oSchedGroup;
-            if oSchedGroup.fEnabled and oSchedGroup.idBuildSrc is not None:
+            if    oSchedGroup.fEnabled \
+              and oSchedGroup.idBuildSrc is not None \
+              and oSchedGroup.idSchedGroup not in dIgnoreSchedGroupIds:
                 return (oSchedGroup, 0);
 
@@ -1330 +1332 @@
 
             # Pick the next one.
-            iWorkItem += 1;
-            if iWorkItem >= len(aoFlat):
-                iWorkItem = 0;
-            if iWorkItem < len(aoFlat):
-                return (aoFlat[iWorkItem], iWorkItem);
+            cLeft = len(aoFlat);
+            while cLeft > 0:
+                cLeft     -= 1;
+                iWorkItem += 1;
+                if iWorkItem >= len(aoFlat) or iWorkItem < 0:
+                    iWorkItem = 0;
+                if aoFlat[iWorkItem].idSchedGroup not in dIgnoreSchedGroupIds:
+                    return (aoFlat[iWorkItem], iWorkItem);
 
         # No active group.
@@ -1375 +1380 @@
               and oTestBoxDataEx.idGenTestBox == oTestBoxData.idGenTestBox:
 
-                # Now, pick the scheduling group.
-                (oSchedGroup, iWorkItem) = SchedulerBase._pickSchedGroup(oTestBoxDataEx, iWorkItem);
-                if oSchedGroup is not None:
+                # We may have to skip scheduling groups that are out of work (e.g. 'No build').
+                dIgnoreSchedGroupIds = [];
+                while True:
+                    # Now, pick the scheduling group.
+                    (oSchedGroup, iWorkItem) = SchedulerBase._pickSchedGroup(oTestBoxDataEx, iWorkItem, dIgnoreSchedGroupIds);
+                    if oSchedGroup is None:
+                        break;
                     assert oSchedGroup.fEnabled and oSchedGroup.idBuildSrc is not None;
 
-                    #
                     # Instantiate the specified scheduler and let it do the rest.
-                    #
                     oScheduler = SchedulerBase._instantiate(oDb, oSchedGroup, iVerbosity, tsSecStart);
                     dResponse = oScheduler.scheduleNewTaskWorker(oTestBoxDataEx, tsNow, sBaseUrl);
@@ -1389 +1396 @@
                         oDb.commit();
                         return dResponse;
+                    dIgnoreSchedGroupIds[oSchedGroup.idSchedGroup] = oSchedGroup;
         except:
             oDb.rollback();