Return-Path: Delivered-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Received: (qmail 1619 invoked from network); 6 Apr 2011 06:23:11 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 6 Apr 2011 06:23:11 -0000 Received: (qmail 27323 invoked by uid 500); 6 Apr 2011 06:23:10 -0000 Delivered-To: apmail-hadoop-hdfs-commits-archive@hadoop.apache.org Received: (qmail 27281 invoked by uid 500); 6 Apr 2011 06:23:10 -0000 Mailing-List: contact hdfs-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hdfs-dev@hadoop.apache.org Delivered-To: mailing list hdfs-commits@hadoop.apache.org Received: (qmail 27270 invoked by uid 99); 6 Apr 2011 06:23:09 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Apr 2011 06:23:09 +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; Wed, 06 Apr 2011 06:23:07 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 00C9D23889F7; Wed, 6 Apr 2011 06:22:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1089317 - in /hadoop/hdfs/branches/yahoo-merge: CHANGES.txt src/test/hdfs/org/apache/hadoop/hdfs/MiniDFSCluster.java src/test/hdfs/org/apache/hadoop/hdfs/TestHDFSServerPorts.java Date: Wed, 06 Apr 2011 06:22:37 -0000 To: hdfs-commits@hadoop.apache.org From: omalley@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110406062238.00C9D23889F7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: omalley Date: Wed Apr 6 06:22:37 2011 New Revision: 1089317 URL: http://svn.apache.org/viewvc?rev=1089317&view=rev Log: commit 7a25d1080be9bc4946aee027c4bf9fe36890fee6 Author: Owen O'Malley Date: Tue Apr 5 15:52:19 2011 -0700 HDFS-1809. Missing DefaultMetricsSystem initialization breaks some tests. (Suresh Srinivas) Conflicts: YAHOO-CHANGES.txt src/test/hdfs/org/apache/hadoop/hdfs/MiniDFSCluster.java Modified: hadoop/hdfs/branches/yahoo-merge/CHANGES.txt hadoop/hdfs/branches/yahoo-merge/src/test/hdfs/org/apache/hadoop/hdfs/MiniDFSCluster.java hadoop/hdfs/branches/yahoo-merge/src/test/hdfs/org/apache/hadoop/hdfs/TestHDFSServerPorts.java Modified: hadoop/hdfs/branches/yahoo-merge/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/yahoo-merge/CHANGES.txt?rev=1089317&r1=1089316&r2=1089317&view=diff ============================================================================== --- hadoop/hdfs/branches/yahoo-merge/CHANGES.txt (original) +++ hadoop/hdfs/branches/yahoo-merge/CHANGES.txt Wed Apr 6 06:22:37 2011 @@ -252,11 +252,15 @@ Trunk (unreleased changes) HDFS-1656. Fixes an issue to do with fetching of delegation tokens in HftpFileSystem. (Kan Zhang via ddas) + HDFS-1809. Missing DefaultMetricsSystem initialization breaks some tests. + (suresh) + Release 0.22.0 - Unreleased NEW FEATURES HDFS-992. Re-factor block access token implementation to conform to the - generic Token interface in Common (Kan Zhang and Jitendra Pandey via jghoman) + generic Token interface in Common (Kan Zhang and Jitendra Pandey via + jghoman) HDFS-599. Allow NameNode to have a seprate port for service requests from client requests. (Dmytro Molkov via hairong) Modified: hadoop/hdfs/branches/yahoo-merge/src/test/hdfs/org/apache/hadoop/hdfs/MiniDFSCluster.java URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/yahoo-merge/src/test/hdfs/org/apache/hadoop/hdfs/MiniDFSCluster.java?rev=1089317&r1=1089316&r2=1089317&view=diff ============================================================================== --- hadoop/hdfs/branches/yahoo-merge/src/test/hdfs/org/apache/hadoop/hdfs/MiniDFSCluster.java (original) +++ hadoop/hdfs/branches/yahoo-merge/src/test/hdfs/org/apache/hadoop/hdfs/MiniDFSCluster.java Wed Apr 6 06:22:37 2011 @@ -83,7 +83,7 @@ public class MiniDFSCluster { private static final String NAMESERVICE_ID_PREFIX = "nameserviceId"; private static final Log LOG = LogFactory.getLog(MiniDFSCluster.class); - { DefaultMetricsSystem.setMiniClusterMode(true); } + static { DefaultMetricsSystem.setMiniClusterMode(true); } /** * Class to construct instances of MiniDFSClusters with specific options. Modified: hadoop/hdfs/branches/yahoo-merge/src/test/hdfs/org/apache/hadoop/hdfs/TestHDFSServerPorts.java URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/yahoo-merge/src/test/hdfs/org/apache/hadoop/hdfs/TestHDFSServerPorts.java?rev=1089317&r1=1089316&r2=1089317&view=diff ============================================================================== --- hadoop/hdfs/branches/yahoo-merge/src/test/hdfs/org/apache/hadoop/hdfs/TestHDFSServerPorts.java (original) +++ hadoop/hdfs/branches/yahoo-merge/src/test/hdfs/org/apache/hadoop/hdfs/TestHDFSServerPorts.java Wed Apr 6 06:22:37 2011 @@ -34,6 +34,7 @@ import org.apache.hadoop.hdfs.server.dat import org.apache.hadoop.hdfs.server.namenode.BackupNode; import org.apache.hadoop.hdfs.server.namenode.NameNode; import org.apache.hadoop.hdfs.HdfsConfiguration; +import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem; import org.apache.hadoop.net.DNS; import org.apache.hadoop.test.GenericTestUtils; @@ -48,6 +49,7 @@ import org.apache.hadoop.test.GenericTes * a free port and start on it. */ public class TestHDFSServerPorts extends TestCase { + static { DefaultMetricsSystem.setMiniClusterMode(true); } public static final Log LOG = LogFactory.getLog(TestHDFSServerPorts.class); public static final String NAME_NODE_HOST = "localhost:";