TAJO-1111: TestKillQuery.testKillQueryFromInitState occasionally fails. Closes #198
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/22c43c0a Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/22c43c0a Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/22c43c0a Branch: refs/heads/block_iteration Commit: 22c43c0aded9b4689f863b38550c52d5ee5135c5 Parents: 0646eda Author: Hyunsik Choi <[email protected]> Authored: Fri Oct 10 11:22:19 2014 -0700 Committer: Hyunsik Choi <[email protected]> Committed: Sat Oct 11 14:28:06 2014 -0700 ---------------------------------------------------------------------- CHANGES | 10 +++++++--- .../java/org/apache/tajo/master/querymaster/Query.java | 2 +- .../org/apache/tajo/master/querymaster/QueryUnit.java | 12 ++++++++---- 3 files changed, 16 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/22c43c0a/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index fda4091..d1618c9 100644 --- a/CHANGES +++ b/CHANGES @@ -168,6 +168,9 @@ Release 0.9.0 - unreleased BUG FIXES + TAJO-1111: TestKillQuery.testKillQueryFromInitState occasionally fails. + (hyunsik) + TAJO-1107: Broadcast join on non-leaf node scans only first data file. (Hyoungjun Kim) @@ -185,12 +188,13 @@ Release 0.9.0 - unreleased TAJO-1102: Self-join with a partitioned table returns wrong result data. (Hyoungjun Kim) - TAJO-1097: IllegalArgumentException: RawFileScanner. (Mai Hai Thanh via jinho) + TAJO-1097: IllegalArgumentException: RawFileScanner. (Mai Hai Thanh via + jinho) TAJO-1103: Insert clause of partitioned table loses some FetchImpls. (jinho) - TAJO-1101: Broadcast join with a zero-length file table returns wrong result data. - (Hyoungjun Kim) + TAJO-1101: Broadcast join with a zero-length file table returns wrong + result data. (Hyoungjun Kim) TAJO-1067: INSERT OVERWRITE INTO should not remove all partitions. (jaehwa) http://git-wip-us.apache.org/repos/asf/tajo/blob/22c43c0a/tajo-core/src/main/java/org/apache/tajo/master/querymaster/Query.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/master/querymaster/Query.java b/tajo-core/src/main/java/org/apache/tajo/master/querymaster/Query.java index 7899365..d3f5b1d 100644 --- a/tajo-core/src/main/java/org/apache/tajo/master/querymaster/Query.java +++ b/tajo-core/src/main/java/org/apache/tajo/master/querymaster/Query.java @@ -194,7 +194,7 @@ public class Query implements EventHandler<QueryEvent> { INTERNAL_ERROR_TRANSITION) // Ignore-able transitions .addTransition(QueryState.QUERY_ERROR, QueryState.QUERY_ERROR, - QueryEventType.KILL) + EnumSet.of(QueryEventType.KILL, QueryEventType.SUBQUERY_COMPLETED)) .installTopology(); http://git-wip-us.apache.org/repos/asf/tajo/blob/22c43c0a/tajo-core/src/main/java/org/apache/tajo/master/querymaster/QueryUnit.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/master/querymaster/QueryUnit.java b/tajo-core/src/main/java/org/apache/tajo/master/querymaster/QueryUnit.java index 03c6d30..8a3ef74 100644 --- a/tajo-core/src/main/java/org/apache/tajo/master/querymaster/QueryUnit.java +++ b/tajo-core/src/main/java/org/apache/tajo/master/querymaster/QueryUnit.java @@ -152,17 +152,21 @@ public class QueryUnit implements EventHandler<TaskEvent> { // Transitions from SUCCEEDED state // Ignore-able transitions .addTransition(TaskState.SUCCEEDED, TaskState.SUCCEEDED, - EnumSet.of(TaskEventType.T_KILL, TaskEventType.T_ATTEMPT_KILLED, TaskEventType.T_ATTEMPT_SUCCEEDED)) + EnumSet.of(TaskEventType.T_KILL, + TaskEventType.T_ATTEMPT_KILLED, TaskEventType.T_ATTEMPT_SUCCEEDED, TaskEventType.T_ATTEMPT_FAILED)) // Transitions from FAILED state // Ignore-able transitions .addTransition(TaskState.FAILED, TaskState.FAILED, - EnumSet.of(TaskEventType.T_KILL, TaskEventType.T_ATTEMPT_KILLED, TaskEventType.T_ATTEMPT_SUCCEEDED)) + EnumSet.of(TaskEventType.T_KILL, + TaskEventType.T_ATTEMPT_KILLED, TaskEventType.T_ATTEMPT_SUCCEEDED, TaskEventType.T_ATTEMPT_FAILED)) // Transitions from KILLED state + .addTransition(TaskState.KILLED, TaskState.KILLED, TaskEventType.T_ATTEMPT_KILLED, new KillTaskTransition()) + // Ignore-able transitions .addTransition(TaskState.KILLED, TaskState.KILLED, - TaskEventType.T_ATTEMPT_KILLED, - new KillTaskTransition()) + EnumSet.of( + TaskEventType.T_KILL, TaskEventType.T_ATTEMPT_SUCCEEDED, TaskEventType.T_ATTEMPT_FAILED)) .installTopology();
