Repository: ambari Updated Branches: refs/heads/trunk 9d0d2a04a -> af9842245
AMBARI-17844: Update the content of various llap log4j properties. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/af984224 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/af984224 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/af984224 Branch: refs/heads/trunk Commit: af9842245e3fda05a73cbd8e59f7dbe528bc7eab Parents: 9d0d2a0 Author: Nahappan Somasundaram <[email protected]> Authored: Thu Jul 21 15:04:26 2016 -0700 Committer: Nahappan Somasundaram <[email protected]> Committed: Thu Jul 21 17:10:35 2016 -0700 ---------------------------------------------------------------------- .../HIVE/configuration/llap-cli-log4j2.xml | 8 +-- .../HIVE/configuration/llap-daemon-log4j.xml | 68 +++++++++++++++++--- 2 files changed, 64 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/af984224/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 a28aab3..25315b4 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 @@ -59,17 +59,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 = %p %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} 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 @@ -97,8 +96,9 @@ logger.HadoopConf.level = ERROR # root logger rootLogger.level = ${sys:hive.log.level} -rootLogger.appenderRefs = root +rootLogger.appenderRefs = root, DRFA rootLogger.appenderRef.root.ref = ${sys:hive.root.logger} +rootLogger.appenderRef.DRFA.ref = DRFA </value> <value-attributes> <type>content</type> http://git-wip-us.apache.org/repos/asf/ambari/blob/af984224/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 0abee63..1f724d7 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 @@ -52,44 +52,96 @@ property.llap.daemon.log.dir = . property.llap.daemon.log.file = llapdaemon.log property.llap.daemon.historylog.file = llapdaemon_history.log property.llap.daemon.log.maxfilesize = 256MB -property.llap.daemon.log.maxbackupindex = 20 +property.llap.daemon.log.maxbackupindex = 240 # list of all appenders -appenders = console, RFA, HISTORYAPPENDER +appenders = console, RFA, HISTORYAPPENDER, dag-routing, query-routing # console appender 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%x] %p %c{2} : %m%n +appender.console.layout.pattern = %d{ISO8601} %5p [%t (%X{fragmentId})] %c{2}: %m%n # rolling file appender -appender.RFA.type = RollingFile +appender.RFA.type = RollingRandomAccessFile appender.RFA.name = RFA appender.RFA.fileName = ${sys:llap.daemon.log.dir}/${sys:llap.daemon.log.file} -appender.RFA.filePattern = ${sys:llap.daemon.log.dir}/${sys:llap.daemon.log.file}_%i +appender.RFA.filePattern = ${sys:llap.daemon.log.dir}/${sys:llap.daemon.log.file}_%d{yyyy-MM-dd-HH}_%i appender.RFA.layout.type = PatternLayout -appender.RFA.layout.pattern = %d{ISO8601} %-5p [%t%x]: %c{2} (%F:%M(%L)) - %m%n +appender.RFA.layout.pattern = %d{ISO8601} %-5p [%t (%X{fragmentId})] %c: %m%n appender.RFA.policies.type = Policies +appender.RFA.policies.time.type = TimeBasedTriggeringPolicy +appender.RFA.policies.time.interval = 1 +appender.RFA.policies.time.modulate = true appender.RFA.policies.size.type = SizeBasedTriggeringPolicy appender.RFA.policies.size.size = ${sys:llap.daemon.log.maxfilesize} appender.RFA.strategy.type = DefaultRolloverStrategy appender.RFA.strategy.max = ${sys:llap.daemon.log.maxbackupindex} # history file appender -appender.HISTORYAPPENDER.type = RollingFile +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}_%i +appender.HISTORYAPPENDER.filePattern = ${sys:llap.daemon.log.dir}/${sys:llap.daemon.historylog.file}_%d{yyyy-MM-dd}_%i appender.HISTORYAPPENDER.layout.type = PatternLayout appender.HISTORYAPPENDER.layout.pattern = %m%n appender.HISTORYAPPENDER.policies.type = Policies appender.HISTORYAPPENDER.policies.size.type = SizeBasedTriggeringPolicy appender.HISTORYAPPENDER.policies.size.size = ${sys:llap.daemon.log.maxfilesize} +appender.HISTORYAPPENDER.policies.time.type = TimeBasedTriggeringPolicy +appender.HISTORYAPPENDER.policies.time.interval = 1 +appender.HISTORYAPPENDER.policies.time.modulate = true appender.HISTORYAPPENDER.strategy.type = DefaultRolloverStrategy appender.HISTORYAPPENDER.strategy.max = ${sys:llap.daemon.log.maxbackupindex} +# dagId based routing file appender +appender.dag-routing.type = Routing +appender.dag-routing.name = dag-routing +appender.dag-routing.routes.type = Routes +appender.dag-routing.routes.pattern = $${ctx:dagId} +#Purge polciy for dag-based Routing Appender +appender.dag-routing.purgePolicy.type = LlapRoutingAppenderPurgePolicy +# Note: Do not change this name without changing the corresponding entry in LlapConstants +appender.dag-routing.purgePolicy.name = llapLogPurgerDagRouting +# default route +appender.dag-routing.routes.route-default.type = Route +appender.dag-routing.routes.route-default.key = $${ctx:dagId} +appender.dag-routing.routes.route-default.ref = RFA +# dagId based route +appender.dag-routing.routes.route-mdc.type = Route +appender.dag-routing.routes.route-mdc.file-mdc.type = LlapWrappedAppender +appender.dag-routing.routes.route-mdc.file-mdc.name = IrrelevantName-dag-routing +appender.dag-routing.routes.route-mdc.file-mdc.app.type=RandomAccessFile +appender.dag-routing.routes.route-mdc.file-mdc.app.name=file-mdc +appender.dag-routing.routes.route-mdc.file-mdc.app.fileName = ${sys:llap.daemon.log.dir}/${ctx:dagId}.log +appender.dag-routing.routes.route-mdc.file-mdc.app.layout.type = PatternLayout +appender.dag-routing.routes.route-mdc.file-mdc.app.layout.pattern = %d{ISO8601} %5p [%t (%X{fragmentId})] %c{2}: %m%n + +# queryId based routing file appender +appender.query-routing.type = Routing +appender.query-routing.name = query-routing +appender.query-routing.routes.type = Routes +appender.query-routing.routes.pattern = $${ctx:queryId} +#Purge polciy for query-based Routing Appender +appender.query-routing.purgePolicy.type = LlapRoutingAppenderPurgePolicy +# Note: Do not change this name without changing the corresponding entry in LlapConstants +appender.query-routing.purgePolicy.name = llapLogPurgerQueryRouting +# default route +appender.query-routing.routes.route-default.type = Route +appender.query-routing.routes.route-default.key = $${ctx:queryId} +appender.query-routing.routes.route-default.ref = RFA +# queryId based route +appender.query-routing.routes.route-mdc.type = Route +appender.query-routing.routes.route-mdc.file-mdc.type = LlapWrappedAppender +appender.query-routing.routes.route-mdc.file-mdc.name = IrrelevantName-query-routing +appender.query-routing.routes.route-mdc.file-mdc.app.type = RandomAccessFile +appender.query-routing.routes.route-mdc.file-mdc.app.name = file-mdc +appender.query-routing.routes.route-mdc.file-mdc.app.fileName = ${sys:llap.daemon.log.dir}/${ctx:queryId}-${ctx:dagId}.log +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 = NIOServerCnxn, ClientCnxnSocketNIO, DataNucleus, Datastore, JPOX, HistoryLogger, LlapIoImpl, LlapIoOrc, LlapIoCache, LlapIoLocking
