You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by hy...@apache.org on 2014/03/02 08:33:40 UTC
git commit: TAJO-630: QueryMasterTask never finished when Internal
error occurs.
Repository: incubator-tajo
Updated Branches:
refs/heads/master 4238dd22d -> 15c4576ef
TAJO-630: QueryMasterTask never finished when Internal error occurs.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tajo/commit/15c4576e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tajo/tree/15c4576e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tajo/diff/15c4576e
Branch: refs/heads/master
Commit: 15c4576ef680e05be877e9bb5b4370a03857c446
Parents: 4238dd2
Author: Hyunsik Choi <hy...@apache.org>
Authored: Sun Mar 2 16:33:21 2014 +0900
Committer: Hyunsik Choi <hy...@apache.org>
Committed: Sun Mar 2 16:33:21 2014 +0900
----------------------------------------------------------------------
CHANGES.txt | 3 +++
.../java/org/apache/tajo/master/querymaster/QueryMasterTask.java | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/15c4576e/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1ca6620..128ed99 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -269,6 +269,9 @@ Release 0.8.0 - unreleased
BUG FIXES
+ TAJO-630: QueryMasterTask never finished when Internal error occurs.
+ (hyunsik)
+
TAJO-638: QueryUnitAttempt causes Invalid event error: TA_UPDATE at
TA_ASSIGNED. (hyunsik)
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/15c4576e/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/QueryMasterTask.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/QueryMasterTask.java b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/QueryMasterTask.java
index 67feaf0..7719a85 100644
--- a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/QueryMasterTask.java
+++ b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/QueryMasterTask.java
@@ -282,7 +282,8 @@ public class QueryMasterTask extends CompositeService {
return
state == QueryState.QUERY_SUCCEEDED ||
state == QueryState.QUERY_FAILED ||
- state == QueryState.QUERY_KILLED;
+ state == QueryState.QUERY_KILLED ||
+ state == QueryState.QUERY_ERROR;
}
}