Author: bobby
Date: Tue Mar 6 16:19:10 2012
New Revision: 1297558
URL: http://svn.apache.org/viewvc?rev=1297558&view=rev
Log:
svn merge -c 1297557 from trunk to branch-0.23 FIXES: MAPREDUCE-3976.
TestRMContainerAllocator failing (Jason Lowe via bobby)
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/metrics/MRAppMetrics.java
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1297558&r1=1297557&r2=1297558&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Tue
Mar 6 16:19:10 2012
@@ -194,6 +194,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
NEW FEATURES
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/metrics/MRAppMetrics.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/metrics/MRAppMetrics.java?rev=1297558&r1=1297557&r2=1297558&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/metrics/MRAppMetrics.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/metrics/MRAppMetrics.java
Tue Mar 6 16:19:10 2012
@@ -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());
}
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java?rev=1297558&r1=1297557&r2=1297558&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
Tue Mar 6 16:19:10 2012
@@ -451,8 +451,8 @@ public class ResourceManager extends Com
}
startWepApp();
- MetricsSystem ms = DefaultMetricsSystem.initialize("ResourceManager");
- JvmMetrics.create("ResourceManager", null, ms);
+ DefaultMetricsSystem.initialize("ResourceManager");
+ JvmMetrics.initSingleton("ResourceManager", null);
try {
rmDTSecretManager.startThreads();
} catch(IOException ie) {
