You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by ja...@apache.org on 2014/06/18 06:22:13 UTC
[03/13] git commit: Commit dd2ae0ae got lost during merge,
reintroducing the race condition.
Commit dd2ae0ae got lost during merge, reintroducing the race condition.
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/5079f8b8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/5079f8b8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/5079f8b8
Branch: refs/heads/master
Commit: 5079f8b868841f4f632f5d4ef869defc02bb9c31
Parents: 2e07b0b
Author: Aditya Kishore <ad...@maprtech.com>
Authored: Tue Jun 17 00:43:02 2014 -0700
Committer: Aditya Kishore <ad...@maprtech.com>
Committed: Tue Jun 17 00:43:02 2014 -0700
----------------------------------------------------------------------
.../main/java/org/apache/drill/exec/work/foreman/Foreman.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/5079f8b8/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/Foreman.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/Foreman.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/Foreman.java
index 826a22f..9a67653 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/Foreman.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/Foreman.java
@@ -376,6 +376,9 @@ public class Foreman implements Runnable, Closeable, Comparable<Object>{
}
}
+ int totalFragments = 1 + intermediateFragments.size() + leafFragments.size();
+ fragmentManager.getStatus().setTotalFragments(totalFragments);
+ fragmentManager.getStatus().updateCache();
logger.debug("Fragments stored.");
logger.debug("Submitting fragments to run.");
@@ -383,9 +386,6 @@ public class Foreman implements Runnable, Closeable, Comparable<Object>{
logger.debug("Fragments running.");
state.updateState(QueryState.PENDING, QueryState.RUNNING);
- int totalFragments = 1 + intermediateFragments.size() + leafFragments.size();
- fragmentManager.getStatus().setTotalFragments(totalFragments);
- fragmentManager.getStatus().updateCache();
} catch (Exception e) {
fail("Failure while setting up query.", e);