svn merge -c 1297557 from trunk to branch-0.23.2 FIXES: MAPREDUCE-3976. TestRMContainerAllocator failing (Jason Lowe via bobby)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23.2@1297559 13f79535-47bb-0310-9956-ffa450edef68

hadoop-mapreduce-project/CHANGES.txt

@@ -145,6 +145,8 @@ Release 0.23.2 - UNRELEASED
     MAPREDUCE-3034. Ensure NodeManager reboots itself on direction from
     ResourceManager. (Devaraj K & Eric Payne via acmurthy) 
 
+    MAPREDUCE-3976. TestRMContainerAllocator failing (Jason Lowe via bobby)
+
 Release 0.23.1 - 2012-02-17
 
   INCOMPATIBLE CHANGES

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/metrics/MRAppMetrics.java

@@ -55,7 +55,7 @@ public class MRAppMetrics {
   }
 
   public static MRAppMetrics create(MetricsSystem ms) {
-    JvmMetrics.create("MRAppMaster", null, ms);
+    JvmMetrics.initSingleton("MRAppMaster", null);
     return ms.register(new MRAppMetrics());
   }
 

hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java

@@ -451,8 +451,8 @@ public class ResourceManager extends CompositeService implements Recoverable {
     }
 
     startWepApp();
-    MetricsSystem ms = DefaultMetricsSystem.initialize("ResourceManager");
-    JvmMetrics.create("ResourceManager", null, ms);
+    DefaultMetricsSystem.initialize("ResourceManager");
+    JvmMetrics.initSingleton("ResourceManager", null);
     try {
       rmDTSecretManager.startThreads();
     } catch(IOException ie) {