HPCC-32964 Add a Roxie Background priority queue 2

Signed-off-by: M Kelly <[email protected]>
hpcc-systems · Nov 14, 2024 · 7e079d2 · 7e079d2
1 parent b0c6f2b
commit 7e079d2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 18 deletions.
diff --git a/roxie/ccd/ccd.hpp b/roxie/ccd/ccd.hpp
@@ -333,8 +333,8 @@ extern unsigned memoryStatsInterval;
 extern unsigned pingInterval;
 extern unsigned socketCheckInterval;
 extern memsize_t defaultMemoryLimit;
-extern unsigned defaultTimeLimit[4];
-extern unsigned defaultWarnTimeLimit[4];
+extern unsigned defaultTimeLimit[3];
+extern unsigned defaultWarnTimeLimit[3];
 extern unsigned defaultThorConnectTimeout;
 extern bool pretendAllOpt;
 extern ClientCertificate clientCert;

diff --git a/roxie/ccd/ccdmain.cpp b/roxie/ccd/ccdmain.cpp
@@ -164,8 +164,8 @@ int backgroundCopyPrio = 0;
 
 unsigned memoryStatsInterval = 0;
 memsize_t defaultMemoryLimit;
-unsigned defaultTimeLimit[4] = {0, 0, 0, 0};
-unsigned defaultWarnTimeLimit[4] = {0, 5000, 5000, 10000};
+unsigned defaultTimeLimit[3] = {0, 0, 0};
+unsigned defaultWarnTimeLimit[3] = {0, 5000, 5000};
 unsigned defaultThorConnectTimeout;
 
 unsigned defaultParallelJoinPreload = 0;
@@ -1169,11 +1169,9 @@ int CCD_API roxie_main(int argc, const char *argv[], const char * defaultYaml)
         defaultTimeLimit[0] = (unsigned) topology->getPropInt64("@defaultLowPriorityTimeLimit", 0);
         defaultTimeLimit[1] = (unsigned) topology->getPropInt64("@defaultHighPriorityTimeLimit", 0);
         defaultTimeLimit[2] = (unsigned) topology->getPropInt64("@defaultSLAPriorityTimeLimit", 0);
-        defaultTimeLimit[3] = (unsigned) topology->getPropInt64("@defaultBGPriorityTimeLimit", 0);
         defaultWarnTimeLimit[0] = (unsigned) topology->getPropInt64("@defaultLowPriorityTimeWarning", 0);
         defaultWarnTimeLimit[1] = (unsigned) topology->getPropInt64("@defaultHighPriorityTimeWarning", 0);
         defaultWarnTimeLimit[2] = (unsigned) topology->getPropInt64("@defaultSLAPriorityTimeWarning", 0);
-        defaultWarnTimeLimit[3] = (unsigned) topology->getPropInt64("@defaultBGPriorityTimeWarning", 0);
         defaultThorConnectTimeout = (unsigned) topology->getPropInt64("@defaultThorConnectTimeout", 60);
         continuationCompressThreshold = (unsigned) topology->getPropInt64("@continuationCompressThreshold", 1024);
 

diff --git a/roxie/ccd/ccdquery.cpp b/roxie/ccd/ccdquery.cpp
@@ -402,8 +402,9 @@ void QueryOptions::setFromWorkUnit(IConstWorkUnit &wu, const IPropertyTree *stat
         updateFromContext(priority, stateInfo, "@priority");
     if ((int)priority < 0)
     {
-        timeLimit = defaultTimeLimit[3];
-        warnTimeLimit = defaultWarnTimeLimit[3];
+        // use LOW queue time limits ...
+        timeLimit = defaultTimeLimit[2];
+        warnTimeLimit = defaultWarnTimeLimit[2];
     }
     else
     {

diff --git a/roxie/ccd/ccdstate.cpp b/roxie/ccd/ccdstate.cpp
@@ -2439,16 +2439,6 @@ class CRoxiePackageSetManager : implements IRoxieQueryPackageManagerSet, impleme
                 defaultWarnTimeLimit[2] = control->getPropInt("@limit", 0);
                 topology->setPropInt("@defaultSLAPriorityTimeWarning", defaultWarnTimeLimit[2]);
             }
-            else if (stricmp(queryName, "control:defaultBGPriorityTimeLimit")==0)
-            {
-                defaultTimeLimit[3] = control->getPropInt("@limit", 0);
-                topology->setPropInt("@defaultBGPriorityTimeLimit", defaultTimeLimit[3]);
-            }
-            else if (stricmp(queryName, "control:defaultBGPriorityTimeWarning")==0)
-            {
-                defaultWarnTimeLimit[3] = control->getPropInt("@limit", 0);
-                topology->setPropInt("@defaultBGPriorityTimeWarning", defaultWarnTimeLimit[3]);
-            }
             else if (stricmp(queryName, "control:deleteUnneededPhysicalFiles")==0)
             {
                 UNIMPLEMENTED;