Skip to content

Commit

Permalink
HPCC-31118 Fix roxie crash restarting while cluster is processing que…
Browse files Browse the repository at this point in the history
…ries

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

This reverts commit 5db2478.
  • Loading branch information
ghalliday committed Jan 15, 2024
1 parent 1d8e100 commit 25aa10e
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions roxie/ccd/ccdmain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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)
{
Expand Down

0 comments on commit 25aa10e

Please sign in to comment.