Author: tomwhite
Date: Tue Dec 18 15:26:29 2012
New Revision: 1423472
URL: http://svn.apache.org/viewvc?rev=1423472&view=rev
Log:
MAPREDUCE-4845. ClusterStatus.getMaxMemory() and getUsedMemory() exist in MR1
but not MR2. Contributed by Sandy Ryza.
Modified:
hadoop/common/branches/branch-1/CHANGES.txt
hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/ClusterStatus.java
Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1423472&r1=1423471&r2=1423472&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Tue Dec 18 15:26:29 2012
@@ -142,6 +142,9 @@ Release 1.2.0 - 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
HDFS-2533. Backport: Remove needless synchronization on some FSDataSet
Modified:
hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/ClusterStatus.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/ClusterStatus.java?rev=1423472&r1=1423471&r2=1423472&view=diff
==============================================================================
---
hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/ClusterStatus.java
(original)
+++
hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/ClusterStatus.java
Tue Dec 18 15:26:29 2012
@@ -329,6 +329,7 @@ public class ClusterStatus implements Wr
*
* @return the size of heap memory used by the <code>JobTracker</code>
*/
+ @Deprecated
public long getUsedMemory() {
return used_memory;
}
@@ -338,6 +339,7 @@ public class ClusterStatus implements Wr
*
* @return the configured size of max heap memory that can be used by the
<code>JobTracker</code>
*/
+ @Deprecated
public long getMaxMemory() {
return max_memory;
}
