Changeset 56802 in vbox for trunk/src/VBox

Timestamp:

Jul 3, 2015 11:14:09 PM (9 years ago)

Author:

vboxsync

Message:

schedulerbase.py: Disable SQL explain, it will otherwise deadlock because of the table locking in recreateQueue. Use the new insertList() method on the database interface to speed up scheduling queue creation (45000 database single row inserts is slow). Disabled some of the debug output.

File:

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

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

@@ -612 +612 @@
                 aoItems = self._recreateQueueItems(oData);
                 self.msgDebug('len(aoItems)=%s' % (len(aoItems),));
-                for i in range(len(aoItems)):
-                    self.msgDebug('aoItems[%2d]=%s' % (i, aoItems[i]));
+                #for i in range(len(aoItems)):
+                #    self.msgDebug('aoItems[%2d]=%s' % (i, aoItems[i]));
             if len(aoItems) > 0:
                 self._oDb.execute('SELECT offQueue FROM SchedQueues WHERE idSchedGroup = %s ORDER BY idItem LIMIT 1'
@@ -633 +633 @@
             self._recreateQueueCancelGatherings();
             self._oDb.execute('DELETE FROM SchedQueues WHERE idSchedGroup = %s\n', (self._oSchedGrpData.idSchedGroup,));
-            for oItem in aoItems:
-                self._oDb.execute('INSERT INTO SchedQueues (\n'
+            self._oDb.insertList('INSERT INTO SchedQueues (\n'
                                   '         idSchedGroup,\n'
                                   '         offQueue,\n'
@@ -641 +640 @@
                                   '         aidTestGroupPreReqs,\n'
                                   '         bmHourlySchedule,\n'
-                                  '         cMissingGangMembers )\n'
-                                  'VALUES ( %s, %s, %s, %s, %s, %s, %s )\n'
-                                  , ( oItem.idSchedGroup,
-                                      oItem.offQueue,
-                                      oItem.idGenTestCaseArgs,
-                                      oItem.idTestGroup,
-                                      oItem.aidTestGroupPreReqs if len(oItem.aidTestGroupPreReqs) > 0 else None,
-                                      oItem.bmHourlySchedule,
-                                      oItem.cMissingGangMembers
-                                  ));
+                                  '         cMissingGangMembers )\n',
+                                 aoItems, self._formatItemForInsert);
         return (aoErrors, self._asMessages);
+
+    def _formatItemForInsert(self, oItem):
+        """
+        Used by recreateQueueWorker together with TMDatabaseConnect::insertList
+        """
+        return self._oDb.formatBindArgs('(%s,%s,%s,%s,%s,%s,%s)'
+                                        , ( oItem.idSchedGroup,
+                                            oItem.offQueue,
+                                            oItem.idGenTestCaseArgs,
+                                            oItem.idTestGroup,
+                                            oItem.aidTestGroupPreReqs if len(oItem.aidTestGroupPreReqs) > 0 else None,
+                                            oItem.bmHourlySchedule,
+                                            oItem.cMissingGangMembers
+                                        ));
 
     @staticmethod
@@ -664 +669 @@
         Raises exception database error.
         """
+
+        aoExtraMsgs = [];
+        if oDb.debugIsExplainEnabled():
+            aoExtraMsgs += ['Warning! Disabling SQL explain to avoid deadlocking against locked tables.'];
+            oDb.debugDisableExplain();
+
         aoErrors   = [];
         asMessages = [];
@@ -696 +707 @@
             raise;
 
-        return (aoErrors, asMessages);
+        return (aoErrors, aoExtraMsgs + asMessages);