PIG-5327: Check for DAG status before trying to kill (rohini)
git-svn-id: https://svn.apache.org/repos/asf/pig/trunk@1820659 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 87ed7b2..c1f3e48 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -64,6 +64,8 @@
BUG FIXES
+PIG-5327: Check for DAG status before trying to kill (rohini)
+
PIG-5325: Schema disambiguation can't be turned off for nested schemas (szita)
PIG-5311: POReservoirSample fails for more than Integer.MAX_VALUE records (rohini)
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/TezJob.java b/src/org/apache/pig/backend/hadoop/executionengine/tez/TezJob.java
index d561904..37b4854 100644
--- a/src/org/apache/pig/backend/hadoop/executionengine/tez/TezJob.java
+++ b/src/org/apache/pig/backend/hadoop/executionengine/tez/TezJob.java
@@ -283,11 +283,11 @@
public void killJob() throws IOException {
try {
- if (dagClient != null) {
+ if (dagClient != null && (dagStatus == null || !dagStatus.isCompleted())) {
dagClient.tryKillDAG();
}
if (tezClient != null) {
- tezClient.stop();
+ TezSessionManager.stopSession(tezClient);
}
} catch (TezException e) {
throw new IOException("Cannot kill DAG - Application Id: " + appId, e);
