HIVE-12340 : ExecDriver.execute() unnecessarily sets METASTOREPWD to HIVE (Hari Subramaniyan, reviewed by Sushanth Sowmyan)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/81de8570 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/81de8570 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/81de8570 Branch: refs/heads/master-fixed Commit: 81de85706c68ef395c758241fbaf88f02b0d1941 Parents: 4d2df79 Author: Hari Subramaniyan <[email protected]> Authored: Thu Nov 5 11:47:59 2015 -0800 Committer: Hari Subramaniyan <[email protected]> Committed: Thu Nov 5 11:47:59 2015 -0800 ---------------------------------------------------------------------- .../org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java | 10 ---------- 1 file changed, 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/81de8570/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java index 5cbf764..380cf08 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java @@ -390,12 +390,6 @@ public class ExecDriver extends Task<MapredWork> implements Serializable, Hadoop } } - // remove the pwd from conf file so that job tracker doesn't show this - // logs - String pwd = HiveConf.getVar(job, HiveConf.ConfVars.METASTOREPWD); - if (pwd != null) { - HiveConf.setVar(job, HiveConf.ConfVars.METASTOREPWD, "HIVE"); - } JobClient jc = new JobClient(job); // make this client wait if job tracker is not behaving well. Throttle.checkJobTracker(job, LOG); @@ -433,10 +427,6 @@ public class ExecDriver extends Task<MapredWork> implements Serializable, Hadoop // Finally SUBMIT the JOB! rj = jc.submitJob(job); - // replace it back - if (pwd != null) { - HiveConf.setVar(job, HiveConf.ConfVars.METASTOREPWD, pwd); - } returnVal = jobExecHelper.progress(rj, jc, ctx.getHiveTxnManager()); success = (returnVal == 0);
