Repository: ambari Updated Branches: refs/heads/trunk c7a3bcd9c -> acde50281
AMBARI-21850. Keep Hive/LLAP log4j properties file in sync. (Prasanth Jayachandran via Swapan Shridhar). Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/acde5028 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/acde5028 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/acde5028 Branch: refs/heads/trunk Commit: acde502817ed185921a5b56a75af4fb814d3c353 Parents: c7a3bcd Author: Swapan Shridhar <sshrid...@hortonworks.com> Authored: Fri Sep 8 16:53:48 2017 -0700 Committer: Swapan Shridhar <sshrid...@hortonworks.com> Committed: Fri Sep 8 16:54:09 2017 -0700 ---------------------------------------------------------------------- .../HIVE/configuration/hive-exec-log4j2.xml | 6 +++--- .../services/HIVE/configuration/hive-log4j2.xml | 20 +++++++++++++++----- .../HIVE/configuration/llap-cli-log4j2.xml | 6 +++--- .../HIVE/configuration/llap-daemon-log4j.xml | 9 +++++++-- 4 files changed, 28 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/acde5028/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-exec-log4j2.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-exec-log4j2.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-exec-log4j2.xml index b96a468..3854640 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-exec-log4j2.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-exec-log4j2.xml @@ -60,14 +60,14 @@ appender.console.type = Console appender.console.name = console appender.console.target = SYSTEM_ERR appender.console.layout.type = PatternLayout -appender.console.layout.pattern = %d{yy/MM/dd HH:mm:ss} [%t]: %p %c{2}: %m%n +appender.console.layout.pattern = %d{ISO8601} %5p [%t] %c{2}: %m%n # simple file appender -appender.FA.type = File +appender.FA.type = RandomAccessFile appender.FA.name = FA appender.FA.fileName = ${sys:hive.log.dir}/${sys:hive.log.file} appender.FA.layout.type = PatternLayout -appender.FA.layout.pattern = %d{ISO8601} %-5p [%t]: %c{2} (%F:%M(%L)) - %m%n +appender.FA.layout.pattern = %d{ISO8601} %5p [%t] %c{2}: %m%n # list of all loggers loggers = NIOServerCnxn, ClientCnxnSocketNIO, DataNucleus, Datastore, JPOX http://git-wip-us.apache.org/repos/asf/ambari/blob/acde5028/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-log4j2.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-log4j2.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-log4j2.xml index 079bdce..7de3567 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-log4j2.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-log4j2.xml @@ -71,6 +71,7 @@ property.hive.log.level = {{hive_log_level}} property.hive.root.logger = DRFA property.hive.log.dir = ${sys:java.io.tmpdir}/${sys:user.name} property.hive.log.file = hive.log +property.hive.perflogger.log.level = INFO # list of all appenders appenders = console, DRFA @@ -80,16 +81,16 @@ appender.console.type = Console appender.console.name = console appender.console.target = SYSTEM_ERR appender.console.layout.type = PatternLayout -appender.console.layout.pattern = %d{yy/MM/dd HH:mm:ss} [%t]: %p %c{2}: %m%n +appender.console.layout.pattern = %d{ISO8601} %5p [%t] %c{2}: %m%n # daily rolling file appender -appender.DRFA.type = RollingFile +appender.DRFA.type = RollingRandomAccessFile appender.DRFA.name = DRFA appender.DRFA.fileName = ${sys:hive.log.dir}/${sys:hive.log.file} # Use %pid in the filePattern to append process-id@host-name to the filename if you want separate log files for different CLI session -appender.DRFA.filePattern = ${sys:hive.log.dir}/${sys:hive.log.file}.%d{yyyy-MM-dd}_%i.gz +appender.DRFA.filePattern = ${sys:hive.log.dir}/${sys:hive.log.file}.%d{yyyy-MM-dd} appender.DRFA.layout.type = PatternLayout -appender.DRFA.layout.pattern = %d{ISO8601} %-5p [%t]: %c{2} (%F:%M(%L)) - %m%n +appender.DRFA.layout.pattern = %d{ISO8601} %5p [%t] %c{2}: %m%n appender.DRFA.policies.type = Policies appender.DRFA.policies.time.type = TimeBasedTriggeringPolicy appender.DRFA.policies.time.interval = 1 @@ -100,7 +101,7 @@ appender.DRFA.policies.fsize.type = SizeBasedTriggeringPolicy appender.DRFA.policies.fsize.size = {{hive2_log_maxfilesize}}MB # list of all loggers -loggers = NIOServerCnxn, ClientCnxnSocketNIO, DataNucleus, Datastore, JPOX +loggers = NIOServerCnxn, ClientCnxnSocketNIO, DataNucleus, Datastore, JPOX, PerfLogger, AmazonAws, ApacheHttp logger.NIOServerCnxn.name = org.apache.zookeeper.server.NIOServerCnxn logger.NIOServerCnxn.level = WARN @@ -117,6 +118,15 @@ logger.Datastore.level = ERROR logger.JPOX.name = JPOX logger.JPOX.level = ERROR +logger.AmazonAws.name=com.amazonaws +logger.AmazonAws.level = INFO + +logger.ApacheHttp.name=org.apache.http +logger.ApacheHttp.level = INFO + +logger.PerfLogger.name = org.apache.hadoop.hive.ql.log.PerfLogger +logger.PerfLogger.level = ${sys:hive.perflogger.log.level} + # root logger rootLogger.level = ${sys:hive.log.level} rootLogger.appenderRefs = root http://git-wip-us.apache.org/repos/asf/ambari/blob/acde5028/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-cli-log4j2.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-cli-log4j2.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-cli-log4j2.xml index ed52447..f40cfa8 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-cli-log4j2.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-cli-log4j2.xml @@ -86,7 +86,7 @@ appender.console.layout.pattern = %p %c{2}: %m%n # llapstatusconsole appender appender.llapstatusconsole.type = Console appender.llapstatusconsole.name = llapstatusconsole -appender.llapstatusconsole.target = SYSTEM_OUT +appender.llapstatusconsole.target = SYSTEM_ERR appender.llapstatusconsole.layout.type = PatternLayout appender.llapstatusconsole.layout.pattern = %m%n @@ -94,8 +94,8 @@ appender.llapstatusconsole.layout.pattern = %m%n appender.DRFA.type = RollingRandomAccessFile appender.DRFA.name = DRFA appender.DRFA.fileName = ${sys:hive.log.dir}/${sys:hive.log.file} -# Use %pid in the filePattern to append process-id@host-name to the filename if you want separate log files for different CLI session -appender.DRFA.filePattern = ${sys:hive.log.dir}/${sys:hive.log.file}.%d{yyyy-MM-dd}_%i +# Use %pidn in the filePattern to append process-id@host-name to the filename if you want separate log files for different CLI session +appender.DRFA.filePattern = ${sys:hive.log.dir}/${sys:hive.log.file}.%d{yyyy-MM-dd} appender.DRFA.layout.type = PatternLayout appender.DRFA.layout.pattern = %d{ISO8601} %5p [%t] %c{2}: %m%n appender.DRFA.policies.type = Policies http://git-wip-us.apache.org/repos/asf/ambari/blob/acde5028/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-daemon-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-daemon-log4j.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-daemon-log4j.xml index 0b8e0ee..44d0175 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-daemon-log4j.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-daemon-log4j.xml @@ -112,7 +112,7 @@ appender.RFA.strategy.max = ${sys:llap.daemon.log.maxbackupindex} appender.HISTORYAPPENDER.type = RollingRandomAccessFile appender.HISTORYAPPENDER.name = HISTORYAPPENDER appender.HISTORYAPPENDER.fileName = ${sys:llap.daemon.log.dir}/${sys:llap.daemon.historylog.file} -appender.HISTORYAPPENDER.filePattern = ${sys:llap.daemon.log.dir}/${sys:llap.daemon.historylog.file}_%d{yyyy-MM-dd}_%i.done +appender.HISTORYAPPENDER.filePattern = ${sys:llap.daemon.log.dir}/${sys:llap.daemon.historylog.file}_%d{yyyy-MM-dd-HH}_%i.done appender.HISTORYAPPENDER.layout.type = PatternLayout appender.HISTORYAPPENDER.layout.pattern = %m%n appender.HISTORYAPPENDER.policies.type = Policies @@ -148,7 +148,12 @@ appender.query-routing.routes.route-mdc.file-mdc.app.layout.type = PatternLayout appender.query-routing.routes.route-mdc.file-mdc.app.layout.pattern = %d{ISO8601} %5p [%t (%X{fragmentId})] %c{2}: %m%n # list of all loggers -loggers = PerfLogger, EncodedReader, NIOServerCnxn, ClientCnxnSocketNIO, DataNucleus, Datastore, JPOX, HistoryLogger, LlapIoImpl, LlapIoOrc, LlapIoCache, LlapIoLocking, TezSM, TezSS, TezHC +loggers = PerfLogger, EncodedReader, NIOServerCnxn, ClientCnxnSocketNIO, DataNucleus, Datastore, JPOX, HistoryLogger, LlapIoImpl, LlapIoOrc, LlapIoCache, LlapIoLocking, TezSM, TezSS, TezHC, LlapDaemon + +logger.LlapDaemon.name = org.apache.hadoop.hive.llap.daemon.impl.LlapDaemon +logger.LlapDaemon.level = INFO + +# shut up the Tez logs that log debug-level stuff on INFO logger.TezSM.name = org.apache.tez.runtime.library.common.shuffle.impl.ShuffleManager.fetch logger.TezSM.level = WARN