Merge remote-tracking branch 'origin/candidate-9.2.x' into candidate-…

…9.4.x Signed-off-by: Gavin Halliday <[email protected]>
hpcc-systems · Jan 19, 2024 · 1fc701a · 1fc701a
2 parents cc88ce3 + caa1ddf
commit 1fc701a
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/thorlcr/graph/thgraph.cpp b/thorlcr/graph/thgraph.cpp
@@ -2907,7 +2907,13 @@ void CJobBase::addDependencies(IPropertyTree *xgmml, bool failIfMissing)
 
 bool CJobBase::queryUseCheckpoints() const
 {
-    return globals->getPropBool("@checkPointRecovery") || 0 != getWorkUnitValueInt("checkPointRecovery", 0);
+    bool configured = globals->getPropBool("@checkPointRecovery") || 0 != getWorkUnitValueInt("checkPointRecovery", 0);
+    if (configured && isContainerized())
+    {
+        WARNLOG("Containerized Thor does not support checkpoint recovery");
+        return false;
+    }
+    return configured;
 }
 
 void CJobBase::abort(IException *e)