Updated Branches: refs/heads/trunk 2328e7254 -> f4cc4c887
AMBARI-2836. HBase 0.95.2 - Logger doesn't work. (Andrew Onischuk via mahadev) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/f4cc4c88 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/f4cc4c88 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/f4cc4c88 Branch: refs/heads/trunk Commit: f4cc4c887b39050d11a0b472a3df84e7d7a16124 Parents: 2328e72 Author: Mahadev Konar <[email protected]> Authored: Fri Aug 9 12:59:10 2013 -0700 Committer: Mahadev Konar <[email protected]> Committed: Fri Aug 9 12:59:10 2013 -0700 ---------------------------------------------------------------------- .../puppet/modules/hdp-hbase/manifests/init.pp | 2 +- .../hdp-hbase/templates/log4j.properties.erb | 80 -------------------- 2 files changed, 1 insertion(+), 81 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/f4cc4c88/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp b/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp index 66d3a4f..7ac10a1 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp +++ b/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp @@ -106,7 +106,7 @@ class hdp-hbase( override_owner => true } - hdp-hbase::configfile { ['hbase-env.sh','log4j.properties','hadoop-metrics.properties']: + hdp-hbase::configfile { ['hbase-env.sh','hadoop-metrics.properties']: type => $type } http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/f4cc4c88/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/log4j.properties.erb ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/log4j.properties.erb b/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/log4j.properties.erb deleted file mode 100644 index 5227c9a..0000000 --- a/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/log4j.properties.erb +++ /dev/null @@ -1,80 +0,0 @@ -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -# - -# Define some default values that can be overridden by system properties -hbase.root.logger=INFO,console -hbase.log.dir=. -hbase.log.file=hbase.log - -# Define the root logger to the system property "hbase.root.logger". -log4j.rootLogger=${hbase.root.logger} - -# Logging Threshold -log4j.threshold=ALL - -# -# Daily Rolling File Appender -# -log4j.appender.DRFA=org.apache.log4j.DailyRollingFileAppender -log4j.appender.DRFA.File=${hbase.log.dir}/${hbase.log.file} - -# Rollver at midnight -log4j.appender.DRFA.DatePattern=.yyyy-MM-dd - -# 30-day backup -#log4j.appender.DRFA.MaxBackupIndex=30 -log4j.appender.DRFA.layout=org.apache.log4j.PatternLayout - -# Pattern format: Date LogLevel LoggerName LogMessage -log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %p %c: %m%n - -# Debugging Pattern format -#log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n - - -# -# console -# Add "console" to rootlogger above if you want to use this -# -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.target=System.err -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{2}: %m%n - -# Custom Logging levels - -log4j.logger.org.apache.zookeeper=INFO -#log4j.logger.org.apache.hadoop.fs.FSNamesystem=DEBUG -log4j.logger.org.apache.hadoop.hbase=INFO -# Make these two classes INFO-level. Make them DEBUG to see more zk debug. -log4j.logger.org.apache.hadoop.hbase.zookeeper.ZKUtil=INFO -log4j.logger.org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher=INFO -#log4j.logger.org.apache.hadoop.dfs=DEBUG -# Set this class to log INFO only otherwise its OTT - -# Uncomment this line to enable tracing on _every_ RPC call (this can be a lot of output) -#log4j.logger.org.apache.hadoop.ipc.HBaseServer.trace=DEBUG - -# Uncomment the below if you want to remove logging of client region caching' -# and scan of .META. messages -# log4j.logger.org.apache.hadoop.hbase.client.HConnectionManager$HConnectionImplementation=INFO -# log4j.logger.org.apache.hadoop.hbase.client.MetaScanner=INFO
