Quellcode durchsuchen

Merge pull request #14349 from richardkchapman/hpcc25019

HPCC-25019 Internal errors in Roxie in localAgent mode

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Merged-by: Gavin Halliday <ghalliday@hpccsystems.com>
Gavin Halliday vor 4 Jahren
Ursprung
Commit
479574fe4d
1 geänderte Dateien mit 6 neuen und 1 gelöschten Zeilen
  1. 6 1
      roxie/ccd/ccd.hpp

+ 6 - 1
roxie/ccd/ccd.hpp

@@ -147,6 +147,8 @@ public:
     }
 };
 
+extern bool localAgent;
+
 class RoxiePacketHeader
 {
 private:
@@ -195,6 +197,8 @@ public:
 #ifdef SUBCHANNELS_IN_HEADER
     unsigned mySubChannel() const // NOTE - 0 based
     {
+        if (localAgent)
+            return 0;
         for (unsigned idx = 0; idx < MAX_SUBCHANNEL; idx++)
         {
             if (subChannels[idx].isMe())
@@ -205,6 +209,8 @@ public:
 
     bool hasBuddies() const
     {
+        if (localAgent)
+            return false;
         if (subChannels[1].isNull())
         {
             assert(subChannels[0].isMe());
@@ -275,7 +281,6 @@ extern bool debugPermitted;
 extern bool useRemoteResources;
 extern bool checkFileDate;
 extern bool lazyOpen;
-extern bool localAgent;
 extern bool useAeron;
 extern bool ignoreOrphans;
 extern bool doIbytiDelay;