big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MAPREDUCE-3976. TestRMContainerAllocator failing (Jason Lowe via bobby)

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1297557 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Joseph Evans 2012-03-06 16:17:41 +00:00
parent 0ee71adeb4
commit a98b756c73
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-mapreduce-project/CHANGES.txt
View File

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

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

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

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

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