Ver código fonte

HPCC-9567 Ignore (unreliable) numDataCopies value in overloaded mode

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 12 anos atrás
pai
commit
d40f73f774
1 arquivos alterados com 3 adições e 2 exclusões
  1. 3 2
      roxie/ccd/ccdmain.cpp

+ 3 - 2
roxie/ccd/ccdmain.cpp

@@ -859,12 +859,13 @@ int STARTQUERY_API start_query(int argc, const char *argv[])
         }
         else if (strnicmp(slaveConfig, "overloaded", 10) == 0)
         {
-            if (numChannels != numNodes * numDataCopies)
+            unsigned copiesPerNode = numChannels / numNodes;
+            if (numChannels != numNodes * copiesPerNode)
                 throw MakeStringException(MSGAUD_operator, ROXIE_INVALID_TOPOLOGY, "Invalid topology file - numChannels does not match expected value");
             for (int i=0; i<numNodes; i++)
             {
                 int channel = i+1;
-                for (int copy=0; copy<numDataCopies; copy++)
+                for (int copy=0; copy<copiesPerNode; copy++)
                 {
                     channel = channel + copy*numNodes;
                     addChannel(i, channel, copy);