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 tg...@apache.org on 2012/12/20 22:55:44 UTC
svn commit: r1424729 - in
/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: CHANGES.txt
hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/ClusterStatus.java
Author: tgraves
Date: Thu Dec 20 21:55:43 2012
New Revision: 1424729
URL: http://svn.apache.org/viewvc?rev=1424729&view=rev
Log:
MAPREDUCE-4845. ClusterStatus.getMaxMemory() and getUsedMemory() exist in MR1 but not MR2 (Sandy Ryza via tgraves)
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/ClusterStatus.java
Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1424729&r1=1424728&r2=1424729&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Thu Dec 20 21:55:43 2012
@@ -11,6 +11,9 @@ Release 0.23.6 - UNRELEASED
MAPREDUCE-4811. JobHistoryServer should show when it was started in WebUI
About page (Ravi Prakash via jlowe)
+ MAPREDUCE-4845. ClusterStatus.getMaxMemory() and getUsedMemory() exist in
+ MR1 but not MR2 (Sandy Ryza via tgraves)
+
OPTIMIZATIONS
BUG FIXES
Modified: hadoop/common/branches/branch-0.23/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/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/ClusterStatus.java?rev=1424729&r1=1424728&r2=1424729&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/ClusterStatus.java (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/ClusterStatus.java Thu Dec 20 21:55:43 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.