Merge pull request #17573 from jakesmith/HPCC-29923-avoid-rowserver-c…

…ancel HPCC-29923 Avoid CRowServer cancel if not running
hpcc-systems · Jul 13, 2023 · 784285f · 784285f
2 parents 1210cb5 + 99af224
commit 784285f
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/thorlcr/thorutil/thormisc.cpp b/thorlcr/thorutil/thormisc.cpp
@@ -1364,8 +1364,9 @@ class CRowServer : public CSimpleInterface, implements IThreaded, implements IRo
 #ifdef TRACE_GLOBAL_GROUP
         ActPrintLog(activity, "%s", __func__);
 #endif
-        running = false;
-        comm.cancel(RANK_ALL, mpTag);
+        bool wanted = true;
+        if (running.compare_exchange_strong(wanted, false))
+            comm.cancel(RANK_ALL, mpTag);
     }
 };