From ec1a930822ae9f732d27bb07d9fae046f0b98b86 Mon Sep 17 00:00:00 2001 From: Arun Murthy Date: Mon, 19 Sep 2011 21:31:56 +0000 Subject: [PATCH] Merge -r 1172846:1172847 from trunk to branch-0.23 to fix MAPREDUCE-3042. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1172848 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../yarn/server/resourcemanager/ResourceTrackerService.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 3a15523be94..7047f7b2f5c 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -1322,6 +1322,9 @@ Release 0.23.0 - Unreleased MAPREDUCE-3030. Fixed a bug in NodeId.equals() that was causing RM to reject all NMs. (Devaraj K via vinodkv) + MAPREDUCE-3042. Fixed default ResourceTracker address. (Chris Riccomini + via acmurthy) + Release 0.22.0 - Unreleased INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java index ba543813ac5..d8c2d2c5433 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java @@ -97,7 +97,7 @@ public ResourceTrackerService(RMContext rmContext, public synchronized void init(Configuration conf) { String resourceTrackerBindAddress = conf.get(YarnConfiguration.RM_RESOURCE_TRACKER_ADDRESS, - YarnConfiguration.RM_RESOURCE_TRACKER_ADDRESS); + YarnConfiguration.DEFAULT_RM_RESOURCE_TRACKER_ADDRESS); resourceTrackerAddress = NetUtils.createSocketAddr(resourceTrackerBindAddress); RackResolver.init(conf);