Changeset 83341 in vbox for trunk/src/VBox/ValidationKit/testmanager

Timestamp:

Mar 19, 2020 8:40:17 PM (5 years ago)

Author:

vboxsync

Message:

TestManager: Don't generate scheduling entries for disabled scheduling groups. Remove items from SchedQueues belonging to deleted scheduling groups when regenerating all queues.

Location:

trunk/src/VBox/ValidationKit/testmanager

Files:

• core/schedulerbase.py (modified) (9 diffs)
• core/schedulerbeci.py (modified) (1 diff)
• webui/wuiadmin.py (modified) (1 diff)

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

@@ -69 +69 @@
         # Load data from the database.
         #
+        oSchedGroupLogic = SchedGroupLogic(oDb);
+        self.oSchedGroup = oSchedGroupLogic.cachedLookup(idSchedGroup);
 
         # Will extend the entries with aoTestCases and dTestCases members
-        # further down.  checkForGroupDepCycles will add aidTestGroupPreReqs.
-        self.aoTestGroups       = SchedGroupLogic(oDb).getMembers(idSchedGroup);
+        # further down (SchedGroupMemberDataEx).  checkForGroupDepCycles
+        # will add aidTestGroupPreReqs.
+        self.aoTestGroups       = oSchedGroupLogic.getMembers(idSchedGroup);
 
         # aoTestCases entries are TestCaseData instance with iSchedPriority
         # and idTestGroup added for our purposes.
         # We will add oTestGroup and aoArgsVariations members to each further down.
-        self.aoTestCases        = SchedGroupLogic(oDb).getTestCasesForGroup(idSchedGroup, cMax = 4096);
+        self.aoTestCases        = oSchedGroupLogic.getTestCasesForGroup(idSchedGroup, cMax = 4096);
 
         # Load dependencies.
@@ -87 +90 @@
         # and idTestGroup added for our purposes.
         # We will add oTestGroup and oTestCase members to each further down.
-        self.aoArgsVariations   = SchedGroupLogic(oDb).getTestCaseArgsForGroup(idSchedGroup, cMax = 65536);
+        self.aoArgsVariations   = oSchedGroupLogic.getTestCaseArgsForGroup(idSchedGroup, cMax = 65536);
 
         #
@@ -262 +265 @@
 
             if oTestGroup.aoTestCases:
-                iTstPrio = oTestGroup.aoTestCases[0];
+                iTstPrio = oTestGroup.aoTestCases[0].iSchedPriority;
                 for iTestCase, oTestCase in enumerate(oTestGroup.aoTestCases):
                     if oTestCase.iSchedPriority > iTstPrio:
@@ -622 +625 @@
             #
             aoItems = list();
-            if oData.aoArgsVariations:
+            if not oData.oSchedGroup.fEnabled:
+                self.msgInfo('Disabled.');
+            elif not oData.aoArgsVariations:
+                self.msgInfo('Found no test case argument variations.');
+            else:
                 aoItems = self._recreateQueueItems(oData);
                 self.msgDebug('len(aoItems)=%s' % (len(aoItems),));
@@ -635 +642 @@
                                       , (self._oSchedGrpData.idSchedGroup,));
                     cItems  = self._oDb.fetchOne()[0];
-                    offQueueNew = (offQueue * cItems) / len(aoItems);
+                    offQueueNew = (offQueue * cItems) // len(aoItems);
                     if offQueueNew != 0:
                         aoItems = aoItems[offQueueNew:] + aoItems[:offQueueNew];
@@ -646 +653 @@
             self._recreateQueueCancelGatherings();
             self._oDb.execute('DELETE FROM SchedQueues WHERE idSchedGroup = %s\n', (self._oSchedGrpData.idSchedGroup,));
-            self._oDb.insertList('INSERT INTO SchedQueues (\n'
-                                  '         idSchedGroup,\n'
-                                  '         offQueue,\n'
-                                  '         idGenTestCaseArgs,\n'
-                                  '         idTestGroup,\n'
-                                  '         aidTestGroupPreReqs,\n'
-                                  '         bmHourlySchedule,\n'
-                                  '         cMissingGangMembers )\n',
-                                 aoItems, self._formatItemForInsert);
+            if aoItems:
+                self._oDb.insertList('INSERT INTO SchedQueues (\n'
+                                      '         idSchedGroup,\n'
+                                      '         offQueue,\n'
+                                      '         idGenTestCaseArgs,\n'
+                                      '         idTestGroup,\n'
+                                      '         aidTestGroupPreReqs,\n'
+                                      '         bmHourlySchedule,\n'
+                                      '         cMissingGangMembers )\n',
+                                     aoItems, self._formatItemForInsert);
         return (aoErrors, self._asMessages);
 
@@ -723 +731 @@
 
 
+    @staticmethod
+    def cleanUpOrphanedQueues(oDb):
+        """
+        Removes orphan scheduling queues from the SchedQueues table.
+
+        Queues becomes orphaned when the scheduling group they belongs to has been deleted.
+
+        Returns number of orphaned queues.
+        Raises exception database error.
+        """
+        cRet = 0;
+        try:
+            oDb.rollback();
+            oDb.begin();
+            oDb.execute('''
+SELECT  SchedQueues.idSchedGroup
+FROM    SchedQueues
+        LEFT OUTER JOIN SchedGroups
+                     ON SchedGroups.idSchedGroup = SchedQueues.idSchedGroup
+                    AND SchedGroups.tsExpire     = 'infinity'::TIMESTAMP
+WHERE   SchedGroups.idSchedGroup is NULL
+GROUP BY SchedQueues.idSchedGroup''');
+            aaoOrphanRows = oDb.fetchAll();
+            cRet = len(aaoOrphanRows);
+            if cRet > 0:
+                oDb.execute('DELETE FROM SchedQueues WHERE idSchedGroup IN (%s)'
+                            % (','.join([str(aoRow[0]) for aoRow in aaoOrphanRows]),));
+                oDb.commit();
+        except:
+            oDb.rollback();
+            raise;
+        return cRet;
+
 
     #
@@ -764 +805 @@
 
         cSecTimeout = oTestEx.cSecTimeout if oTestEx.cSecTimeout is not None else oTestEx.oTestCase.cSecTimeout;
-        cSecTimeout = cSecTimeout * oTestBox.pctScaleTimeout / 100;
+        cSecTimeout = cSecTimeout * oTestBox.pctScaleTimeout // 100;
 
         dResponse   = \
@@ -871 +912 @@
 
         sBaseFilename = '%04d/%02d/%02d/%02d/TestSet-%s' \
-                      % (tsNow.year, tsNow.month, tsNow.day, (tsNow.hour / 6) * 6, idTestSet);
+                      % (tsNow.year, tsNow.month, tsNow.day, (tsNow.hour // 6) * 6, idTestSet);
 
         #

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

@@ -57 +57 @@
                 iPrio = oTestCase.iSchedPriority;
                 assert iPrio in range(32);
-                iPrio = iPrio / 4;
+                iPrio = iPrio // 4;
                 assert iPrio in range(8);
                 if iPrio > iMaxPriority:

trunk/src/VBox/ValidationKit/testmanager/webui/wuiadmin.py

@@ -685 +685 @@
                             else:
                                 self._sPageBody += '<p>%s. [Cannot link to %s]</p>' \
-                                                 % (webutils.escapeElem(oError[0]), webutils.escapeElem(str(oError[1])));
+                                                 % (webutils.escapeElem(oError[0]), webutils.escapeElem(str(oError[1])),);
                     for sMsg in asMessages:
                         self._sPageBody += '<p>%s<p>\n' % (webutils.escapeElem(sMsg),);
+
+            # Remove leftovers from deleted scheduling groups.
+            self._sPageBody += '<h3>Cleanups</h3>\n';
+            cOrphans = SchedulerBase.cleanUpOrphanedQueues(self._oDb);
+            self._sPageBody += '<p>Removed %s orphaned (deleted) queue%s.<p>\n' % (cOrphans, '' if cOrphans == 1 else 's', );
         else:
             self._sPageBody = webutils.escapeElem('%s is a read only user and may not regenerate the scheduling queues!'