hadoop-hdfs-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From omal...@apache.org
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 GMT
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 <omalley@apache.org>
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:";



Mime
View raw message