From 25aa10ed9f6485ad6b8bb821b8a017cd5134f672 Mon Sep 17 00:00:00 2001
From: Gavin Halliday <gavin.halliday@lexisnexis.com>
Date: Mon, 15 Jan 2024 10:06:18 +0000
Subject: [PATCH] HPCC-31118 Fix roxie crash restarting while cluster is
 processing queries

Revert HPCC-30151 ONCE reading remote data cores roxie at startup

This reverts commit 5db2478c338a164d232563dc252622b341d86ee7.
---
 roxie/ccd/ccdmain.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/roxie/ccd/ccdmain.cpp b/roxie/ccd/ccdmain.cpp
index 0b0358b6c90..1f69ae3e696 100644
--- a/roxie/ccd/ccdmain.cpp
+++ b/roxie/ccd/ccdmain.cpp
@@ -1413,6 +1413,12 @@ int CCD_API roxie_main(int argc, const char *argv[], const char * defaultYaml)
 #endif
         configurePreferredPlanes();
         createDelayedReleaser();
+        CCycleTimer loadPackageTimer;
+        globalPackageSetManager = createRoxiePackageSetManager(standAloneDll.getClear());
+        globalPackageSetManager->load();
+        if (traceLevel)
+            DBGLOG("Loading all packages took %ums", loadPackageTimer.elapsedMs());
+
         ROQ = createOutputQueueManager(numAgentThreads, encryptInTransit);
         ROQ->setHeadRegionSize(headRegionSize);
         ROQ->start();
@@ -1428,13 +1434,6 @@ int CCD_API roxie_main(int argc, const char *argv[], const char * defaultYaml)
 
         EnableSEHtoExceptionMapping();
         setSEHtoExceptionHandler(&abortHandler);
-
-        CCycleTimer loadPackageTimer;
-        globalPackageSetManager = createRoxiePackageSetManager(standAloneDll.getClear());
-        globalPackageSetManager->load();
-        if (traceLevel)
-            DBGLOG("Loading all packages took %ums", loadPackageTimer.elapsedMs());
-
         Owned<IHpccProtocolPluginContext> protocolCtx = new CHpccProtocolPluginCtx();
         if (runOnce)
         {