diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 28bfb80c4f..45ae65fcb8 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -179,6 +179,9 @@ Release 2.0.3-alpha - Unreleased MAPREDUCE-4703. Add the ability to start the MiniMRClientCluster using 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 BUG FIXES diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/ClusterStatus.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/ClusterStatus.java index 8886b26638..c527a2776a 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/ClusterStatus.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/ClusterStatus.java @@ -175,6 +175,8 @@ public String toString() { } + public static final int UNINITIALIZED_MEMORY_VALUE = -1; + private int numActiveTrackers; private Collection activeTrackers = new ArrayList(); private int numBlacklistedTrackers; @@ -384,6 +386,22 @@ public int getMaxReduceTasks() { public JobTrackerStatus getJobTrackerStatus() { 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.