Repository: tez Updated Branches: refs/heads/master dca4566b2 -> 539b0e129
TEZ-604. Revert temporary changes made in TEZ-603 to kill the provided tez session, if running a MapReduce job. Contributed by Hitesh Shah. Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/539b0e12 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/539b0e12 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/539b0e12 Branch: refs/heads/master Commit: 539b0e1294d1dec72cff7c6b6581d1d861540aa5 Parents: dca4566 Author: Siddharth Seth <[email protected]> Authored: Fri Dec 11 11:50:03 2015 -0800 Committer: Siddharth Seth <[email protected]> Committed: Fri Dec 11 11:50:03 2015 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/tez/mapreduce/client/YARNRunner.java | 15 --------------- 2 files changed, 1 insertion(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/539b0e12/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index f22303c..d02aa4f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -7,6 +7,7 @@ INCOMPATIBLE CHANGES TEZ-2679. Admin forms of launch env settings TEZ-2948. Stop using dagName in the dagComplete notification to TaskCommunicators. TEZ-2949. Allow duplicate dag names within session for Tez. + TEZ-604. Revert temporary changes made in TEZ-603 to kill the provided tez session, if running a MapReduce job. ALL CHANGES: TEZ-2990. Change test-patch.sh to run through all tests, despite failures in upstream modules http://git-wip-us.apache.org/repos/asf/tez/blob/539b0e12/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/client/YARNRunner.java ---------------------------------------------------------------------- diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/client/YARNRunner.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/client/YARNRunner.java index 8d2cfd5..93a9b87 100644 --- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/client/YARNRunner.java +++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/client/YARNRunner.java @@ -543,25 +543,10 @@ public class YARNRunner implements ClientProtocol { return finalConf; } - private void maybeKillSession() throws IOException { - String sessionAppIdToKill = conf.get("mapreduce.tez.session.tokill-application-id"); - if (sessionAppIdToKill != null) { - ApplicationId killAppId = ConverterUtils.toApplicationId(sessionAppIdToKill); - try { - resMgrDelegate.killApplication(killAppId); - } catch (YarnException e) { - throw new IOException("Failed while killing Session AppId", e); - } - } - } - @Override public JobStatus submitJob(JobID jobId, String jobSubmitDir, Credentials ts) throws IOException, InterruptedException { - // HACK! TEZ-604. Get rid of this once Hive moves all of it's tasks over to Tez native. - maybeKillSession(); - ApplicationId appId = resMgrDelegate.getApplicationId(); FileSystem fs = FileSystem.get(conf);
