Repository: hive Updated Branches: refs/heads/master 244ce09c9 -> c204dd7fb
HIVE-13712: LLAP: LlapServiceDriver should package hadoop-metrics2-llapdaemon.properties when available (Prasanth Jayachandran reviewed by Sergey Shelukhin) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/c204dd7f Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/c204dd7f Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/c204dd7f Branch: refs/heads/master Commit: c204dd7fb9bff2e50a4d1b594fc41438ac5a542e Parents: 244ce09 Author: Prasanth Jayachandran <prasan...@apache.org> Authored: Mon May 9 13:30:49 2016 -0500 Committer: Prasanth Jayachandran <prasan...@apache.org> Committed: Mon May 9 13:30:49 2016 -0500 ---------------------------------------------------------------------- .../hadoop/hive/llap/cli/LlapServiceDriver.java | 16 +++++++++++++--- .../hadoop/hive/llap/daemon/impl/LlapDaemon.java | 1 + 2 files changed, 14 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/c204dd7f/llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapServiceDriver.java ---------------------------------------------------------------------- diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapServiceDriver.java b/llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapServiceDriver.java index 006f70f..6239842 100644 --- a/llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapServiceDriver.java +++ b/llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapServiceDriver.java @@ -401,12 +401,22 @@ public class LlapServiceDriver { IOUtils.copyBytes(loggerContent, lfs.create(new Path(confPath, "llap-daemon-log4j2.properties"), true), conf, true); - URL metrics2 = conf.getResource(LlapDaemon.HADOOP_METRICS2_PROPERTIES_FILE); + String metricsFile = LlapDaemon.LLAP_HADOOP_METRICS2_PROPERTIES_FILE; + URL metrics2 = conf.getResource(metricsFile); + if (metrics2 == null) { + LOG.warn(LlapDaemon.LLAP_HADOOP_METRICS2_PROPERTIES_FILE + " cannot be found." + + " Looking for " + LlapDaemon.HADOOP_METRICS2_PROPERTIES_FILE); + metricsFile = LlapDaemon.HADOOP_METRICS2_PROPERTIES_FILE; + metrics2 = conf.getResource(metricsFile); + } if (metrics2 != null) { InputStream metrics2FileStream = metrics2.openStream(); - IOUtils.copyBytes(metrics2FileStream, - lfs.create(new Path(confPath, LlapDaemon.HADOOP_METRICS2_PROPERTIES_FILE), true), + IOUtils.copyBytes(metrics2FileStream, lfs.create(new Path(confPath, metricsFile), true), conf, true); + LOG.info("Copied hadoop metrics2 properties file from " + metrics2); + } else { + LOG.warn("Cannot find " + LlapDaemon.LLAP_HADOOP_METRICS2_PROPERTIES_FILE + " or " + + LlapDaemon.HADOOP_METRICS2_PROPERTIES_FILE + " in classpath."); } PrintWriter udfStream = http://git-wip-us.apache.org/repos/asf/hive/blob/c204dd7f/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapDaemon.java ---------------------------------------------------------------------- diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapDaemon.java b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapDaemon.java index ca6d8f8..5731b2c 100644 --- a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapDaemon.java +++ b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapDaemon.java @@ -83,6 +83,7 @@ public class LlapDaemon extends CompositeService implements ContainerRunner, Lla private static final Logger LOG = LoggerFactory.getLogger(LlapDaemon.class); public static final String LOG4j2_PROPERTIES_FILE = "llap-daemon-log4j2.properties"; + public static final String LLAP_HADOOP_METRICS2_PROPERTIES_FILE = "hadoop-metrics2-llapdaemon.properties"; public static final String HADOOP_METRICS2_PROPERTIES_FILE = "hadoop-metrics2.properties"; private final Configuration shuffleHandlerConf; private final LlapProtocolServerImpl server;