commit 073c4323f5c9ccada06168f575a3be1fe4cec6ac Author: Bharath Krishna Date: Thu Mar 15 17:34:07 2018 -0700 HIVE-18972 Beeline command suggestion to kill job deprecated diff --git common/src/java/org/apache/hadoop/hive/conf/HiveConf.java common/src/java/org/apache/hadoop/hive/conf/HiveConf.java index 8bbf1be6c13c298d2e8ca5548737c17ba35b0d4c..ee6bc066122651bd7fbc3584cb355ff353f8eed4 100644 --- common/src/java/org/apache/hadoop/hive/conf/HiveConf.java +++ common/src/java/org/apache/hadoop/hive/conf/HiveConf.java @@ -616,6 +616,7 @@ private static void populateLlapDaemonVarsSet(Set llapDaemonVarsSetLocal // values will override any values set in the underlying Hadoop configuration. HADOOPBIN("hadoop.bin.path", findHadoopBinary(), "", true), YARNBIN("yarn.bin.path", findYarnBinary(), "", true), + MAPREDBIN("mapred.bin.path", findMapRedBinary(), "", true), HIVE_FS_HAR_IMPL("fs.har.impl", "org.apache.hadoop.hive.shims.HiveHarFileSystem", "The implementation for accessing Hadoop Archives. Note that this won't be applicable to Hadoop versions less than 0.20"), MAPREDMAXSPLITSIZE(FileInputFormat.SPLIT_MAXSIZE, 256000000L, "", true), @@ -3917,6 +3918,11 @@ private static String findYarnBinary() { val = (val == null ? "yarn" : val + File.separator + "bin" + File.separator + "yarn"); return val; } + private static String findMapRedBinary() { + String val = findHadoopHome(); + val = (val == null ? "mapred" : val + File.separator + "bin" + File.separator + "mapred"); + return val; + } private static String findHadoopHome() { String val = System.getenv("HADOOP_HOME"); 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 eb3a11a8815e35dee825edb7d3246c8ecef6b0a7..fcdc9967f12a454a9d3f31031e2261f264479118 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 @@ -450,7 +450,7 @@ public void jobInfo(RunningJob rj) { } console.printInfo(getJobStartMsg(rj.getID()) + ", Tracking URL = " + rj.getTrackingURL()); - console.printInfo("Kill Command = " + HiveConf.getVar(job, HiveConf.ConfVars.HADOOPBIN) + console.printInfo("Kill Command = " + HiveConf.getVar(job, ConfVars.MAPREDBIN) + " job -kill " + rj.getID()); } }