You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by pr...@apache.org on 2016/02/20 03:05:05 UTC
hive git commit: HIVE-13086: LLAP: Programmatically initialize log4j2
to print out the properties location (Prasanth Jayachandran reviewed by Gopal
V)
Repository: hive
Updated Branches:
refs/heads/master fd59191be -> 0aa1bddff
HIVE-13086: LLAP: Programmatically initialize log4j2 to print out the properties location (Prasanth Jayachandran reviewed by Gopal V)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/0aa1bddf
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/0aa1bddf
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/0aa1bddf
Branch: refs/heads/master
Commit: 0aa1bddfffdf9fa30055ec81562c8e9db91098e8
Parents: fd59191
Author: Prasanth Jayachandran <j....@gmail.com>
Authored: Fri Feb 19 19:59:25 2016 -0600
Committer: Prasanth Jayachandran <j....@gmail.com>
Committed: Fri Feb 19 19:59:25 2016 -0600
----------------------------------------------------------------------
.../hadoop/hive/llap/cli/LlapServiceDriver.java | 3 ++-
.../hadoop/hive/llap/daemon/impl/LlapDaemon.java | 18 ++++++++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/0aa1bddf/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 820b2ed..eac91ca 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
@@ -27,6 +27,7 @@ import java.util.Collection;
import java.util.Properties;
import org.apache.hadoop.hive.llap.configuration.LlapDaemonConfiguration;
+import org.apache.hadoop.hive.llap.daemon.impl.LlapDaemon;
import org.apache.hadoop.hive.llap.daemon.rpc.LlapDaemonProtocolProtos;
import org.apache.hadoop.hive.llap.tezplugins.LlapTezUtils;
import org.apache.tez.dag.api.TezConfiguration;
@@ -224,7 +225,7 @@ public class LlapServiceDriver {
- URL logger = conf.getResource("llap-daemon-log4j2.properties");
+ URL logger = conf.getResource(LlapDaemon.LOG4j2_PROPERTIES_FILE);
if (null == logger) {
throw new Exception("Unable to find required config file: llap-daemon-log4j2.properties");
http://git-wip-us.apache.org/repos/asf/hive/blob/0aa1bddf/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 e066742..8621826 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
@@ -19,6 +19,7 @@ import java.lang.management.ManagementFactory;
import java.lang.management.MemoryPoolMXBean;
import java.lang.management.MemoryType;
import java.net.InetSocketAddress;
+import java.net.URL;
import java.util.Arrays;
import java.util.Set;
import java.util.concurrent.atomic.AtomicLong;
@@ -57,6 +58,7 @@ import org.apache.hadoop.util.ExitUtil;
import org.apache.hadoop.util.JvmPauseMonitor;
import org.apache.hadoop.util.StringUtils;
import org.apache.hive.common.util.ShutdownHookManager;
+import org.apache.logging.log4j.core.config.Configurator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -68,6 +70,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";
private final Configuration shuffleHandlerConf;
private final LlapProtocolServerImpl server;
private final ContainerRunnerImpl containerRunner;
@@ -98,6 +101,8 @@ public class LlapDaemon extends CompositeService implements ContainerRunner, Lla
int mngPort, int shufflePort) {
super("LlapDaemon");
+ initializeLogging();
+
printAsciiArt();
Preconditions.checkArgument(numExecutors > 0);
@@ -205,6 +210,19 @@ public class LlapDaemon extends CompositeService implements ContainerRunner, Lla
addIfService(amReporter);
}
+ private void initializeLogging() {
+ long start = System.currentTimeMillis();
+ URL llap_l4j2 = LlapDaemon.class.getClassLoader().getResource(LOG4j2_PROPERTIES_FILE);
+ if (llap_l4j2 != null) {
+ Configurator.initialize("LlapDaemonLog4j2", llap_l4j2.toString());
+ long end = System.currentTimeMillis();
+ LOG.info("LLAP daemon logging initialized from {} in {} ms", llap_l4j2, (end - start));
+ } else {
+ throw new RuntimeException("Log initialization failed." +
+ " Unable to locate " + LOG4j2_PROPERTIES_FILE + " file in classpath");
+ }
+ }
+
public static long getTotalHeapSize() {
// runtime.getMax() gives a very different number from the actual Xmx sizing.
// you can iterate through the