Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 56C437925 for ; Tue, 11 Oct 2011 02:01:24 +0000 (UTC) Received: (qmail 29509 invoked by uid 500); 11 Oct 2011 02:01:24 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 29483 invoked by uid 500); 11 Oct 2011 02:01:24 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 29476 invoked by uid 99); 11 Oct 2011 02:01:24 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Oct 2011 02:01:24 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Oct 2011 02:01:21 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8E730238888F for ; Tue, 11 Oct 2011 02:01:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1181350 - in /hbase/branches/0.89/conf: hadoop-metrics.properties hbase-site.xml Date: Tue, 11 Oct 2011 02:01:00 -0000 To: commits@hbase.apache.org From: nspiegelberg@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111011020100.8E730238888F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nspiegelberg Date: Tue Oct 11 02:01:00 2011 New Revision: 1181350 URL: http://svn.apache.org/viewvc?rev=1181350&view=rev Log: Revert unintended conf changes from r8089 Modified: hbase/branches/0.89/conf/hadoop-metrics.properties hbase/branches/0.89/conf/hbase-site.xml Modified: hbase/branches/0.89/conf/hadoop-metrics.properties URL: http://svn.apache.org/viewvc/hbase/branches/0.89/conf/hadoop-metrics.properties?rev=1181350&r1=1181349&r2=1181350&view=diff ============================================================================== --- hbase/branches/0.89/conf/hadoop-metrics.properties (original) +++ hbase/branches/0.89/conf/hadoop-metrics.properties Tue Oct 11 02:01:00 2011 @@ -1,29 +1,54 @@ -# DEFAULT METRICS CONFIGURATION -# - Configuration used in production tiers. Allows only JMX stats collection +# See http://wiki.apache.org/hadoop/GangliaMetrics +# Make sure you know whether you are using ganglia 3.0 or 3.1. +# If 3.1, you will have to patch your hadoop instance with HADOOP-4675 +# And, yes, this file is named hadoop-metrics.properties rather than +# hbase-metrics.properties because we're leveraging the hadoop metrics +# package and hadoop-metrics.properties is an hardcoded-name, at least +# for the moment. +# +# See also http://hadoop.apache.org/hbase/docs/current/metrics.html + +# Configuration of the "hbase" context for null +hbase.class=org.apache.hadoop.metrics.spi.NullContext + +# Configuration of the "hbase" context for file +# hbase.class=org.apache.hadoop.hbase.metrics.file.TimeStampingFileContext +# hbase.period=10 +# hbase.fileName=/tmp/metrics_hbase.log + +# Configuration of the "hbase" context for ganglia +# Pick one: Ganglia 3.0 (former) or Ganglia 3.1 (latter) +# hbase.class=org.apache.hadoop.metrics.ganglia.GangliaContext +# hbase.class=org.apache.hadoop.metrics.ganglia.GangliaContext31 +# hbase.period=10 +# hbase.servers=GMETADHOST_IP:8649 -# Configuration of the "dfs" context -dfs.class=org.apache.hadoop.metrics.jmx.JMXContext -dfs.period=10 - -# Configuration of the "mapred" context -mapred.class=org.apache.hadoop.metrics.jmx.JMXContext -dfs.period=10 -jmx_records=jobtracker,tasktracker - -# Configuration of the "jvm" context +# Configuration of the "jvm" context for null jvm.class=org.apache.hadoop.metrics.spi.NullContext - -########################################################### -########################################################### - -# Beta tiers may want to use CompositeContext to enable both JMX + File export -# Example configuration given below... - -#dfs.class=org.apache.hadoop.metrics.spi.CompositeContext -#dfs.arity=2 -#dfs.sub1.class=org.apache.hadoop.metrics.file.FileContext -#dfs.sub1.period=10 -#dfs.fileName=/usr/local/hadoop/logs/DFS1/dfs_metrics.log -#dfs.sub2.class=org.apache.hadoop.metrics.jmx.JMXContext -#dfs.sub2.period=10 +# Configuration of the "jvm" context for file +# jvm.class=org.apache.hadoop.hbase.metrics.file.TimeStampingFileContext +# jvm.period=10 +# jvm.fileName=/tmp/metrics_jvm.log + +# Configuration of the "jvm" context for ganglia +# Pick one: Ganglia 3.0 (former) or Ganglia 3.1 (latter) +# jvm.class=org.apache.hadoop.metrics.ganglia.GangliaContext +# jvm.class=org.apache.hadoop.metrics.ganglia.GangliaContext31 +# jvm.period=10 +# jvm.servers=GMETADHOST_IP:8649 + +# Configuration of the "rpc" context for null +rpc.class=org.apache.hadoop.metrics.spi.NullContext + +# Configuration of the "rpc" context for file +# rpc.class=org.apache.hadoop.hbase.metrics.file.TimeStampingFileContext +# rpc.period=10 +# rpc.fileName=/tmp/metrics_rpc.log + +# Configuration of the "rpc" context for ganglia +# Pick one: Ganglia 3.0 (former) or Ganglia 3.1 (latter) +# rpc.class=org.apache.hadoop.metrics.ganglia.GangliaContext +# rpc.class=org.apache.hadoop.metrics.ganglia.GangliaContext31 +# rpc.period=10 +# rpc.servers=GMETADHOST_IP:8649 Modified: hbase/branches/0.89/conf/hbase-site.xml URL: http://svn.apache.org/viewvc/hbase/branches/0.89/conf/hbase-site.xml?rev=1181350&r1=1181349&r2=1181350&view=diff ============================================================================== --- hbase/branches/0.89/conf/hbase-site.xml (original) +++ hbase/branches/0.89/conf/hbase-site.xml Tue Oct 11 02:01:00 2011 @@ -22,66 +22,4 @@ */ --> - - - - hbase.cluster.distributed - true - For psuedo-distributed, you want to set this to true. - false means that HBase tries to put Master + RegionServers in one process. - Pseudo-distributed = seperate processes/pids - - hbase.regionserver.hlog.replication - 1 - For HBase to offer good data durability, we roll logs if - filesystem replication falls below a certain amount. In psuedo-distributed - mode, you normally only have the local filesystem or 1 HDFS DataNode, so you - don't want to roll logs constantly. - - - hbase.tmp.dir - /tmp/hbase-testing - Temporary directory on the local filesystem. - - - hbase.regionserver.port - 50020 - 50020 - - - hbase.regionserver.info.port - 50030 - 50030 - - - - - - -