Changeset 97328 in vbox

Timestamp:

Oct 27, 2022 5:55:11 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

154325

Message:

changes for /cgi/status.py file, bugref:9778 comment 3

File:

• trunk/src/VBox/ValidationKit/testmanager/cgi/status.py (modified) (3 diffs)

trunk/src/VBox/ValidationKit/testmanager/cgi/status.py

@@ -74 +74 @@
         test_box_os = line[3]
         test_sched_group = line[4]
+
+        # idle testboxes might have an assigned testsets, skipping them
+        if test_result not in g_kdTestStatuses:
+            continue
+
         testboxes_dict = dict_update(testboxes_dict, testbox_name, test_result)
 
@@ -290 +295 @@
             return False;
 
-        #        oDb.execute('''
-        #SELECT  TestBoxesWithStrings.sName,
-        #        TestSets.enmStatus,
-        #        CURRENT_TIMESTAMP - TestSets.tsCreated,
-        #        TestBoxesWithStrings.sOS,
-        #        SchedGroupNames.sSchedGroupNames
-        #FROM    (SELECT TestBoxesInSchedGroups.idTestBox AS idTestBox,
-        #                STRING_AGG(SchedGroups.sName, ',') AS sSchedGroupNames
-        #         FROM   TestBoxesInSchedGroups
-        #         INNER JOIN SchedGroups
-        #                 ON SchedGroups.idSchedGroup = TestBoxesInSchedGroups.idSchedGroup
-        #         WHERE  TestBoxesInSchedGroups.tsExpire = 'infinity'::TIMESTAMP
-        #            AND SchedGroups.tsExpire            = 'infinity'::TIMESTAMP
-        #         GROUP BY TestBoxesInSchedGroups.idTestBox)
-        #        AS SchedGroupNames,
-        #        TestBoxesWithStrings
-        #LEFT OUTER JOIN TestSets
-        #             ON TestSets.idTestBox = TestBoxesWithStrings.idTestBox
-        #            AND (   TestSets.tsCreated > (CURRENT_TIMESTAMP - '%s hours'::interval)
-        #                 OR TestSets.tsDone IS NULL)
-        #WHERE   TestBoxesWithStrings.tsExpire = 'infinity'::TIMESTAMP
-        #  AND   SchedGroupNames.idTestBox = TestBoxesWithStrings.idTestBox
-        #''', (cHoursBack,));
+        #
+        # some comments regarding select below:
+        # first part is about fetching all finished tests for last cHoursBack hours
+        # second part is fetching all tests which isn't done
+        # both old (running more than cHoursBack) and fresh (less than cHoursBack) ones
+        # 'cause we want to know if there's a hanging tests together with currently running
+        #
+        # there's also testsets without status at all, likely because disabled testboxes still have an assigned testsets
+        #
         oDb.execute('''
 (   SELECT  TestBoxesWithStrings.sName,
@@ -355 +346 @@
     LEFT OUTER JOIN TestSets
                  ON TestSets.idTestBox  = TestBoxesWithStrings.idTestBox
-                AND TestSets.tsCreated < (CURRENT_TIMESTAMP - '%s hours'::interval)
                 AND TestSets.tsDone IS NULL
     WHERE   TestBoxesWithStrings.tsExpire = 'infinity'::TIMESTAMP