diff --git llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapServiceDriver.java llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapServiceDriver.java index 358fde9..df07ce3 100644 --- llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapServiceDriver.java +++ llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapServiceDriver.java @@ -272,9 +272,20 @@ private void run(String[] args) throws Exception { lfs.copyFromLocalFile(new Path(logger.toString()), confPath); + String java_home = System.getenv("JAVA_HOME"); + String jre_home = System.getProperty("java.home"); + if (java_home == null) { + java_home = jre_home; + } else if (!java_home.equals(jre_home)) { + LOG.warn("Java versions might not match : JAVA_HOME=%s,process jre=%s", + java_home, jre_home); + } + // extract configs for processing by the python fragments in Slider JSONObject configs = new JSONObject(); + configs.put("java.home", java_home); + configs.put(ConfVars.LLAP_DAEMON_YARN_CONTAINER_MB.varname, HiveConf.getIntVar(conf, ConfVars.LLAP_DAEMON_YARN_CONTAINER_MB)); diff --git llap-server/src/main/resources/package.py llap-server/src/main/resources/package.py index 5620483..20a2510 100644 --- llap-server/src/main/resources/package.py +++ llap-server/src/main/resources/package.py @@ -71,6 +71,7 @@ def main(args): sys.exit(1) return config = json_parse(open(join(input, "config.json")).read()) + java_home = config["java.home"] resource = LlapResource(config) # 5% container failure every monkey_interval seconds monkey_percentage = 5 # 5% @@ -82,7 +83,7 @@ def main(args): "container.mb" : resource.container_size, "container.cores" : resource.container_cores, "hadoop_home" : os.getenv("HADOOP_HOME"), - "java_home" : os.getenv("JAVA_HOME"), + "java_home" : java_home, "name" : args.name, "daemon_args" : args.args, "daemon_loglevel" : args.loglevel, @@ -141,3 +142,4 @@ def main(args): if __name__ == "__main__": main(sys.argv[1:]) +# vim: ai ts=4 noet sw=4 ft=python