You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by to...@apache.org on 2012/12/18 16:23:50 UTC
svn commit: r1423470 - in /hadoop/common/trunk/hadoop-mapreduce-project:
CHANGES.txt
hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/ClusterStatus.java
Author: tomwhite
Date: Tue Dec 18 15:23:49 2012
New Revision: 1423470
URL: http://svn.apache.org/viewvc?rev=1423470&view=rev
Log:
MAPREDUCE-4845. ClusterStatus.getMaxMemory() and getUsedMemory() exist in MR1 but not MR2. Contributed by Sandy Ryza.
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/ClusterStatus.java
Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1423470&r1=1423469&r2=1423470&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Tue Dec 18 15:23:49 2012
@@ -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
Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/ClusterStatus.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/ClusterStatus.java?rev=1423470&r1=1423469&r2=1423470&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/ClusterStatus.java (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/ClusterStatus.java Tue Dec 18 15:23:49 2012
@@ -175,6 +175,8 @@ public class ClusterStatus implements Wr
}
+ public static final int UNINITIALIZED_MEMORY_VALUE = -1;
+
private int numActiveTrackers;
private Collection<String> activeTrackers = new ArrayList<String>();
private int numBlacklistedTrackers;
@@ -384,6 +386,22 @@ public class ClusterStatus implements Wr
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.