You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by jh...@apache.org on 2015/08/24 05:53:14 UTC
tajo git commit: TAJO-1799: Fix incorrect event handler when
kill-query failed.
Repository: tajo
Updated Branches:
refs/heads/master 45ca4993d -> cb6fe8076
TAJO-1799: Fix incorrect event handler when kill-query failed.
Closes #707
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/cb6fe807
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/cb6fe807
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/cb6fe807
Branch: refs/heads/master
Commit: cb6fe80760c60ca6b89dc7b46a028c71c407f37a
Parents: 45ca499
Author: Jinho Kim <jh...@apache.org>
Authored: Mon Aug 24 12:52:32 2015 +0900
Committer: Jinho Kim <jh...@apache.org>
Committed: Mon Aug 24 12:52:32 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/cb6fe807/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index d837e82..b3ed451 100644
--- a/CHANGES
+++ b/CHANGES
@@ -232,6 +232,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/cb6fe807/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()));
}
}