HPCC-31684 Add workunit debug option 'isComplexCompile' to avoid loca…

…l compile Signed-off-by: Gavin Halliday <[email protected]>
hpcc-systems · May 3, 2024 · 5989ae6 · 5989ae6
1 parent c4ea62d
commit 5989ae6
Showing 1 changed file with 17 additions and 15 deletions.
diff --git a/ecl/eclccserver/eclccserver.cpp b/ecl/eclccserver/eclccserver.cpp
@@ -897,20 +897,6 @@ class EclccCompileThread : implements IPooledThread, implements IErrorReporter,
         DBGLOG("Compile request processing for workunit %s", wuid.get());
         Owned<IPropertyTree> config = getComponentConfig();
 
-        if (isContainerized())
-        {
-            if (!useChildProcesses && !childProcessTimeLimit && !config->hasProp("@workunit"))
-            {
-                {
-                    Owned<IWorkUnitFactory> factory = getWorkUnitFactory();
-                    Owned<IWorkUnit> wu = factory->updateWorkUnit(wuid.get());
-                    wu->setContainerizedProcessInfo("EclCCServer", getComponentConfigSP()->queryProp("@name"), k8s::queryMyPodName(), nullptr);
-                }
-                compileViaK8sJob(true);
-                return;
-            }
-        }
-
         Owned<IWorkUnitFactory> factory = getWorkUnitFactory();
         workunit.setown(factory->updateWorkUnit(wuid.get()));
         if (!workunit)
@@ -919,6 +905,23 @@ class EclccCompileThread : implements IPooledThread, implements IErrorReporter,
             return;
         }
 
+        if (isContainerized())
+        {
+            if (!useChildProcesses && !config->hasProp("@workunit"))
+            {
+                //If the timelimit for child processes is 0, or a workunit is explicitly defined as slow to compile
+                //then start the compile immediately using a K8s job.
+                if ((childProcessTimeLimit == 0) || workunit->getDebugValueBool("isComplexCompile", false))
+                {
+                    //NOTE: This call does not modify the workunit itself, so no need to commit afterwards
+                    workunit->setContainerizedProcessInfo("EclCCServer", getComponentConfigSP()->queryProp("@name"), k8s::queryMyPodName(), nullptr);
+                    workunit.clear();
+                    compileViaK8sJob(true);
+                    return;
+                }
+            }
+        }
+
         if (isContainerized())
             workunit->setContainerizedProcessInfo("EclCC", getComponentConfigSP()->queryProp("@name"), k8s::queryMyPodName(), nullptr);
 
@@ -927,7 +930,6 @@ class EclccCompileThread : implements IPooledThread, implements IErrorReporter,
             workunit->setState(WUStateAborted);
             DBGLOG("Workunit %s aborted", wuid.get());
             workunit->commit();
-            workunit.clear();
             return;
         }