HPCC-31511 Avoid keeping the workunit graphs in memory

Changes following review Signed-off-by: Richard Chapman <[email protected]>
hpcc-systems · May 1, 2024 · a19aeae · a19aeae
1 parent 690974a
commit a19aeae
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/esp/platform/CMakeLists.txt b/esp/platform/CMakeLists.txt
@@ -62,6 +62,7 @@ target_link_libraries ( esp
          hrpc 
          remote 
          dalibase 
+         workunit
     ) 
 
 if (NOT CONTAINERIZED)

diff --git a/thorlcr/master/thgraphmanager.cpp b/thorlcr/master/thgraphmanager.cpp
@@ -559,7 +559,7 @@ bool CJobManager::execute(IConstWorkUnit *workunit, const char *wuid, const char
             wu->setDebugAgentListenerIP(sb); //tells debugger what IP to write commands to
             wu->setDebugAgentListenerPort(debugListener->getPort());
         }
-
+        workunitGraphCacheEnabled = getExpertOptBool("workunitGraphCacheEnabled", workunitGraphCacheEnabled);
         return doit(workunit, graphName, agentep);
     }
     catch (IException *e)

diff --git a/thorlcr/slave/thslavemain.cpp b/thorlcr/slave/thslavemain.cpp
@@ -184,6 +184,7 @@ static bool RegisterSelf(SocketEndpoint &masterEp)
         getExpertOptPath(nullptr, xpath); // 'expert' in container world, or 'Debug' in bare-metal
         ensurePTree(globals, xpath);
         unsigned numStrands, blockSize;
+        workunitGraphCacheEnabled = getExpertOptBool("workunitGraphCacheEnabled", workunitGraphCacheEnabled);
         getExpertOptPath("forceNumStrands", xpath.clear());
         if (globals->hasProp(xpath))
             numStrands = globals->getPropInt(xpath);
@@ -393,7 +394,6 @@ int main( int argc, const char *argv[]  )
 #else
         globals.setown(loadConfiguration(globals, argv, "thor", "THOR", nullptr, nullptr, nullptr, false));
 #endif
-        workunitGraphCacheEnabled = globals->getPropBool("expert/@workunitGraphCacheEnabled", workunitGraphCacheEnabled);
 
         // NB: the thor configuration is serialized from the manager and only available after RegisterSelf
         // Until that point, only properties on the command line are available.
-Original file line number
+Diff line change
@@ Expand Up / @@ -62,6 +62,7 @@ target_link_libraries ( esp @@
              hrpc
              remote
              dalibase
+             workunit
         )
     if (NOT CONTAINERIZED)
@@ Expand Down @@