Repository: tajo Updated Branches: refs/heads/branch-0.11.0 37d94a245 -> 03d2dd2d8
TAJO-1799: Fix incorrect event handler when kill-query failed. Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/03d2dd2d Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/03d2dd2d Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/03d2dd2d Branch: refs/heads/branch-0.11.0 Commit: 03d2dd2d83b9796ceed931d3ca9d11d086ce7877 Parents: 37d94a2 Author: Jinho Kim <[email protected]> Authored: Mon Aug 24 12:54:17 2015 +0900 Committer: Jinho Kim <[email protected]> Committed: Mon Aug 24 12:54:17 2015 +0900 ---------------------------------------------------------------------- CHANGES | 2 ++ .../java/org/apache/tajo/querymaster/QueryMasterTask.java | 9 +++------ 2 files changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/03d2dd2d/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 602f20b..8aa0635 100644 --- a/CHANGES +++ b/CHANGES @@ -230,6 +230,8 @@ Release 0.11.0 - unreleased BUG FIXES + TAJO-1799: Fix incorrect event handler when kill-query failed. (jinho) + TAJO-1783: Query result is not returned by invalid output path. (jinho) TAJO-1596: TestPythonFunctions occasionally fails. (jinho) http://git-wip-us.apache.org/repos/asf/tajo/blob/03d2dd2d/tajo-core/src/main/java/org/apache/tajo/querymaster/QueryMasterTask.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/querymaster/QueryMasterTask.java b/tajo-core/src/main/java/org/apache/tajo/querymaster/QueryMasterTask.java index c6e2b35..0f089d5 100644 --- a/tajo-core/src/main/java/org/apache/tajo/querymaster/QueryMasterTask.java +++ b/tajo-core/src/main/java/org/apache/tajo/querymaster/QueryMasterTask.java @@ -37,7 +37,6 @@ import org.apache.tajo.catalog.TableDesc; import org.apache.tajo.conf.TajoConf; import org.apache.tajo.engine.planner.global.MasterPlan; import org.apache.tajo.engine.query.QueryContext; -import org.apache.tajo.exception.TajoException; import org.apache.tajo.ipc.TajoWorkerProtocol; import org.apache.tajo.master.cluster.WorkerConnectionInfo; import org.apache.tajo.master.event.*; @@ -57,8 +56,6 @@ import org.apache.tajo.storage.FormatProperty; import org.apache.tajo.storage.Tablespace; import org.apache.tajo.storage.TablespaceManager; import org.apache.tajo.util.TUtil; -import org.apache.tajo.util.metrics.TajoMetrics; -import org.apache.tajo.util.metrics.reporter.MetricsConsoleReporter; import org.apache.tajo.worker.event.NodeResourceDeallocateEvent; import org.apache.tajo.worker.event.NodeResourceEvent; import org.apache.tajo.worker.event.NodeStatusEvent; @@ -70,8 +67,8 @@ import java.util.*; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicLong; +import static org.apache.tajo.ResourceProtos.TaskFatalErrorReport; import static org.apache.tajo.TajoProtos.QueryState; -import static org.apache.tajo.ResourceProtos.*; public class QueryMasterTask extends CompositeService { private static final Log LOG = LogFactory.getLog(QueryMasterTask.class.getName()); @@ -264,13 +261,13 @@ public class QueryMasterTask extends CompositeService { tajoWorkerRpcClient.killTaskAttempt(null, taskAttemptId.getProto(), callFuture); if(!callFuture.get().getValue()){ - queryMasterContext.getEventHandler().handle( + getEventHandler().handle( new TaskFatalErrorEvent(taskAttemptId, "Can't kill task :" + taskAttemptId)); } } catch (Exception e) { /* Node RPC failure */ LOG.error(e.getMessage(), e); - queryMasterContext.getEventHandler().handle(new TaskFatalErrorEvent(taskAttemptId, e.getMessage())); + getEventHandler().handle(new TaskFatalErrorEvent(taskAttemptId, e.getMessage())); } }
