浏览代码

Merge pull request #1295 from jakesmith/asyncsubgraphs-off-split3.4

Turn off parallel subgraph handling if 1

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 13 年之前
父节点
当前提交
668324805f
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      thorlcr/graph/thgraphmaster.cpp

+ 2 - 1
thorlcr/graph/thgraphmaster.cpp

@@ -1516,6 +1516,7 @@ bool CJobMaster::go()
 
     Owned<IConstWUGraphProgress> graphProgress = getGraphProgress();
     bool allDone = true;
+    unsigned concurrentSubGraphs = (unsigned)getWorkUnitValueInt("concurrentSubGraphs", globals->getPropInt("@concurrentSubGraphs", 1));
     try
     {
         ClearTempDirs();
@@ -1539,7 +1540,7 @@ bool CJobMaster::go()
             if (aborted) break;
             CMasterGraph &graph = toRun.item(g);
             if (graph.isSink())
-                graph.execute(0, NULL, true, true);
+                graph.execute(0, NULL, true, concurrentSubGraphs>1);
             if (queryPausing()) break;
         }
         graphExecutor->wait();