diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/mr/HadoopJobExecHelper.java ql/src/java/org/apache/hadoop/hive/ql/exec/mr/HadoopJobExecHelper.java index 5656f9a..1c3db57 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/mr/HadoopJobExecHelper.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/mr/HadoopJobExecHelper.java @@ -446,8 +446,8 @@ public void jobInfo(RunningJob rj) { } console.printInfo(getJobStartMsg(rj.getID()) + ", Tracking URL = " + rj.getTrackingURL()); - console.printInfo("Kill Command = " + HiveConf.getVar(job, HiveConf.ConfVars.HADOOPBIN) - + " job -kill " + rj.getID()); + console.printInfo("Kill Command = " + HiveConf.getVar(job, HiveConf.ConfVars.YARNBIN) + + " application -kill " + rj.getID()); } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapRedTask.java ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapRedTask.java index a42c2e9..9bcd040 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapRedTask.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapRedTask.java @@ -145,7 +145,7 @@ public int execute(DriverContext driverContext) { super.setInputAttributes(conf); // enable assertion - String hadoopExec = conf.getVar(HiveConf.ConfVars.HADOOPBIN); + String hadoopExec = conf.getVar(HiveConf.ConfVars.YARNBIN); String hiveJar = conf.getJar(); String libJarsOption; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapredLocalTask.java ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapredLocalTask.java index 24bf506..4ff3b81 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapredLocalTask.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapredLocalTask.java @@ -160,7 +160,7 @@ public int executeInChildVM(DriverContext driverContext) { Context ctx = driverContext.getCtx(); String hiveJar = conf.getJar(); - String hadoopExec = conf.getVar(HiveConf.ConfVars.HADOOPBIN); + String hadoopExec = conf.getVar(HiveConf.ConfVars.YARNBIN); conf.setVar(ConfVars.HIVEADDEDJARS, Utilities.getResourceFiles(conf, SessionState.ResourceType.JAR)); // write out the plan to a local file Path planPath = new Path(ctx.getLocalTmpPath(), "plan.xml");