Changeset 61509 in vbox for trunk/src/VBox

Timestamp:

Jun 6, 2016 10:26:04 PM (9 years ago)

Author:

vboxsync

Message:

testmanager: Simple throttling of failures.

Location:

trunk/src/VBox/ValidationKit/testmanager

Files:

• config.py (modified) (2 diffs)
• core/testboxcontroller.py (modified) (1 diff)
• core/testset.py (modified) (1 diff)

trunk/src/VBox/ValidationKit/testmanager/config.py

@@ -8 +8 @@
 __copyright__ = \
 """
-Copyright (C) 2012-2015 Oracle Corporation
+Copyright (C) 2012-2016 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
@@ -93 +93 @@
 
 
+## @name Scheduling parameters
+## @{
+
 ## The time to wait for a gang to gather (in seconds).
-g_kcSecGangGathering    = 600;
+g_kcSecGangGathering                    = 600;
 ## The max time allowed to spend looking for a new task (in seconds).
-g_kcSecMaxNewTask       = 60;
+g_kcSecMaxNewTask                       = 60;
+## Minimum time since last task started.
+g_kcSecMinSinceLastTask                 = 120; # (2 min)
+## Minimum time since last failed task.
+g_kcSecMinSinceLastFailedTask           = 180; # (3 min)
+
+## @}
+
 
 

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

@@ -568 +568 @@
         # If idling and enabled try schedule a new task.
         #
-        if fIdle \
+        if    fIdle \
           and oTestBoxData.fEnabled \
+          and not TestSetLogic(oDb).isTestBoxExecutingToRapidly(oTestBoxData.idTestBox) \
           and oStatusData.enmState == TestBoxStatusData.ksTestBoxState_Idle: # (paranoia)
             dResponse = SchedulerBase.scheduleNewTask(oDb, oTestBoxData, oStatusData.iWorkItem, self._oSrvGlue.getBaseUrl());

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

@@ -711 +711 @@
         return aoRet;
 
+    def isTestBoxExecutingToRapidly(self, idTestBox):
+        """
+        Checks whether the specified test box is executing tests too rapidly.
+
+        The parameters defining too rapid execution are defined in config.py.
+
+        Returns True if it does, False if it doesn't.
+        May raise database problems.
+        """
+
+        self._oDb.execute('(\n'
+                          'SELECT   tsCreated\n'
+                          'FROM     TestSets\n'
+                          'WHERE    idTestBox = %s\n'
+                          '     AND tsCreated >= (CURRENT_TIMESTAMP - interval \'%s seconds\')\n'
+                          ') UNION (\n'
+                          'SELECT   tsCreated\n'
+                          'FROM     TestSets\n'
+                          'WHERE    idTestBox = %s\n'
+                          '     AND tsCreated >= (CURRENT_TIMESTAMP - interval \'%s seconds\')\n'
+                          '     AND enmStatus >= \'failure\'\n'
+                          ')'
+                          , ( idTestBox, config.g_kcSecMinSinceLastTask,
+                              idTestBox, config.g_kcSecMinSinceLastFailedTask, ));
+        return self._oDb.getRowCount() > 0;
+
 
     #