Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
Reply-To: common-dev@hadoop.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1172188 - in
 /hadoop/common/branches/branch-0.20-security:
 CHANGES.txt src/packages/hadoop-setup-conf.sh
 src/packages/templates/conf/hadoop-metrics2.properties
Date: Sun, 18 Sep 2011 04:09:09 -0000
To: common-commits@hadoop.apache.org
From: ddas@apache.org
Message-Id: <20110918040909.C13BE23888EA@eris.apache.org>

Author: ddas
Date: Sun Sep 18 04:09:09 2011
New Revision: 1172188

URL: http://svn.apache.org/viewvc?rev=1172188&view=rev
Log:
HADOOP-7630. Fixes hadoop-metrics2.properties to have a property *.period set to a default value. Contributed by Eric Yang.

Added:
    hadoop/common/branches/branch-0.20-security/src/packages/templates/conf/hadoop-metrics2.properties
Modified:
    hadoop/common/branches/branch-0.20-security/CHANGES.txt
    hadoop/common/branches/branch-0.20-security/src/packages/hadoop-setup-conf.sh

Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/CHANGES.txt?rev=1172188&r1=1172187&r2=1172188&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Sun Sep 18 04:09:09 2011
@@ -187,6 +187,9 @@ Release 0.20.205.0 - unreleased
     HADOOP-7631. Fixes a config problem to do with running streaming jobs
     (Eric Yang via ddas)
 
+    HADOOP-7630. Fixes hadoop-metrics2.properties to have a property
+    *.period set to a default value. (Eric Yang via ddas)
+
   IMPROVEMENTS
 
     MAPREDUCE-2187. Reporter sends progress during sort/merge. (Anupam Seth via

Modified: hadoop/common/branches/branch-0.20-security/src/packages/hadoop-setup-conf.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/packages/hadoop-setup-conf.sh?rev=1172188&r1=1172187&r2=1172188&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/packages/hadoop-setup-conf.sh (original)
+++ hadoop/common/branches/branch-0.20-security/src/packages/hadoop-setup-conf.sh Sun Sep 18 04:09:09 2011
@@ -437,6 +437,9 @@ if [ "${AUTOSETUP}" == "1" -o "${AUTOSET
   if [ ! -e ${HADOOP_CONF_DIR}/log4j.properties ]; then
     cp ${HADOOP_PREFIX}/share/hadoop/templates/conf/log4j.properties ${HADOOP_CONF_DIR}/log4j.properties
   fi
+  if [ ! -e ${HADOOP_CONF_DIR}/hadoop-metrics2.properties ]; then
+    cp ${HADOOP_PREFIX}/share/hadoop/templates/conf/hadoop-metrics2.properties ${HADOOP_CONF_DIR}/hadoop-metrics2.properties
+  fi
 
   #set the owner of the hadoop dir to root
   chown root ${HADOOP_PREFIX}

Added: hadoop/common/branches/branch-0.20-security/src/packages/templates/conf/hadoop-metrics2.properties
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/packages/templates/conf/hadoop-metrics2.properties?rev=1172188&view=auto
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/packages/templates/conf/hadoop-metrics2.properties (added)
+++ hadoop/common/branches/branch-0.20-security/src/packages/templates/conf/hadoop-metrics2.properties Sun Sep 18 04:09:09 2011
@@ -0,0 +1,20 @@
+# 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.
+
+# syntax: [prefix].[source|sink|jmx].[instance].[options]
+# See package.html for org.apache.hadoop.metrics2 for details
+
+*.period=60
+