From a98b756c736ae5f7b6b4bab21d0d85be42ff7c03 Mon Sep 17 00:00:00 2001
From: Robert Joseph Evans <bobby@apache.org>
Date: Tue, 6 Mar 2012 16:17:41 +0000
Subject: [PATCH] MAPREDUCE-3976. TestRMContainerAllocator failing (Jason Lowe
 via bobby)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1297557 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-mapreduce-project/CHANGES.txt                          | 2 ++
 .../apache/hadoop/mapreduce/v2/app/metrics/MRAppMetrics.java  | 2 +-
 .../hadoop/yarn/server/resourcemanager/ResourceManager.java   | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index e2f75214242..81be11cc482 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -278,6 +278,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
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/metrics/MRAppMetrics.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/metrics/MRAppMetrics.java
index d511e330dee..f55457c5b24 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/metrics/MRAppMetrics.java
+++ b/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 static MRAppMetrics create() {
   }
 
   public static MRAppMetrics create(MetricsSystem ms) {
-    JvmMetrics.create("MRAppMaster", null, ms);
+    JvmMetrics.initSingleton("MRAppMaster", null);
     return ms.register(new MRAppMetrics());
   }
 
diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
index 5b0738e293f..55385be0f31 100644
--- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
+++ b/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 void start() {
     }
 
     startWepApp();
-    MetricsSystem ms = DefaultMetricsSystem.initialize("ResourceManager");
-    JvmMetrics.create("ResourceManager", null, ms);
+    DefaultMetricsSystem.initialize("ResourceManager");
+    JvmMetrics.initSingleton("ResourceManager", null);
     try {
       rmDTSecretManager.startThreads();
     } catch(IOException ie) {