Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge -r 1423469:1423470 from trunk to branch-2. Fixes: MAPREDUCE-4845. ClusterStatus.getMaxMemory() and getUsedMemory() exist in MR1 but not MR2. Contributed by Sandy Ryza. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1423471 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas White 2012-12-18 15:25:09 +00:00
parent 5f5b9006de
commit 01c5d0eb77
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,9 @@ Release 2.0.3-alpha - Unreleased
MAPREDUCE-4703. Add the ability to start the MiniMRClientCluster using MAPREDUCE-4703. Add the ability to start the MiniMRClientCluster using
the configurations used before it is being stopped. (ahmed.radwan via tucu) the configurations used before it is being stopped. (ahmed.radwan via tucu)
MAPREDUCE-4845. ClusterStatus.getMaxMemory() and getUsedMemory() exist in
MR1 but not MR2. (Sandy Ryza via tomwhite)
OPTIMIZATIONS OPTIMIZATIONS
BUG FIXES BUG FIXES

18
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/ClusterStatus.java
View File

@ -175,6 +175,8 @@ public String toString() {
} }
public static final int UNINITIALIZED_MEMORY_VALUE = -1;
private int numActiveTrackers; private int numActiveTrackers;
private Collection<String> activeTrackers = new ArrayList<String>(); private Collection<String> activeTrackers = new ArrayList<String>();
private int numBlacklistedTrackers; private int numBlacklistedTrackers;
@ -384,6 +386,22 @@ public int getMaxReduceTasks() {
public JobTrackerStatus getJobTrackerStatus() { public JobTrackerStatus getJobTrackerStatus() {
return status; return status;
} }
/**
* Returns UNINITIALIZED_MEMORY_VALUE (-1)
*/
@Deprecated
public long getMaxMemory() {
return UNINITIALIZED_MEMORY_VALUE;
}
/**
* Returns UNINITIALIZED_MEMORY_VALUE (-1)
*/
@Deprecated
public long getUsedMemory() {
return UNINITIALIZED_MEMORY_VALUE;
}
/** /**
* Gets the list of blacklisted trackers along with reasons for blacklisting. * Gets the list of blacklisted trackers along with reasons for blacklisting.