MAPREDUCE-3066. Fixed default ResourceTracker address for the NodeManager. Contributed by Chris Riccomini.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1173904 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arun Murthy 2011-09-21 23:32:31 +00:00
parent 32f28e6994
commit ed7eda00cb
2 changed files with 4 additions and 1 deletions

View File

@ -1393,6 +1393,9 @@ Release 0.23.0 - Unreleased
MAPREDUCE-3062. Fixed default RMAdmin address. (Chris Riccomini MAPREDUCE-3062. Fixed default RMAdmin address. (Chris Riccomini
via acmurthy) via acmurthy)
MAPREDUCE-3066. Fixed default ResourceTracker address for the NodeManager.
(Chris Riccomini via acmurthy)
Release 0.22.0 - Unreleased Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

View File

@ -101,7 +101,7 @@ public NodeStatusUpdaterImpl(Context context, Dispatcher dispatcher,
public synchronized void init(Configuration conf) { public synchronized void init(Configuration conf) {
this.rmAddress = this.rmAddress =
conf.get(YarnConfiguration.RM_RESOURCE_TRACKER_ADDRESS, conf.get(YarnConfiguration.RM_RESOURCE_TRACKER_ADDRESS,
YarnConfiguration.RM_RESOURCE_TRACKER_ADDRESS); YarnConfiguration.DEFAULT_RM_RESOURCE_TRACKER_ADDRESS);
this.heartBeatInterval = this.heartBeatInterval =
conf.getLong(YarnConfiguration.NM_TO_RM_HEARTBEAT_INTERVAL_MS, conf.getLong(YarnConfiguration.NM_TO_RM_HEARTBEAT_INTERVAL_MS,
YarnConfiguration.DEFAULT_NM_TO_RM_HEARTBEAT_INTERVAL_MS); YarnConfiguration.DEFAULT_NM_TO_RM_HEARTBEAT_INTERVAL_MS);