Author: vinodkv
Date: Wed May 29 00:43:47 2013
New Revision: 1487176
URL: http://svn.apache.org/r1487176
Log:
MAPREDUCE-5237. Add methods that were removed from ClusterStatus back into 2.x
so as to be compatible with 1.x. Contributed by Zhijie Shen.
Incompatible as ClusterStatus.UNINITIALIZED_MEMORY_VALUE is a long now and so
breaks 0.23.x but it shouldn't be a big deal in reality.
svn merge --ignore-ancestry -c 1487175 ../../trunk/
Added:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobTracker.java
- copied unchanged from r1487175,
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobTracker.java
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestClusterStatus.java
- copied unchanged from r1487175,
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestClusterStatus.java
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/ClusterStatus.java
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1487176&r1=1487175&r2=1487176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Wed
May 29 00:43:47 2013
@@ -19,6 +19,11 @@ Release 2.0.5-beta - UNRELEASED
when compared to 1.x. This breaks 0.23.x users of one API in Job. (Mayank
Bansal via vinodkv)
+ MAPREDUCE-5237. Add methods that were removed from ClusterStatus back into
+ 2.x so as to be compatible with 1.x. Incompatible as
+ ClusterStatus.UNINITIALIZED_MEMORY_VALUE is a long now and so breaks 0.23.x
+ but it shouldn't be a big deal in reality. (Zhijie Shen via vinodkv)
+
NEW FEATURES
HADOOP-8562. Enhancements to support Hadoop on Windows Server and Windows
Modified:
hadoop/common/branches/branch-2/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-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/ClusterStatus.java?rev=1487176&r1=1487175&r2=1487176&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/ClusterStatus.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/ClusterStatus.java
Wed May 29 00:43:47 2013
@@ -23,14 +23,13 @@ import java.io.DataOutput;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.io.WritableUtils;
-import org.apache.hadoop.mapreduce.ClusterMetrics;
-import org.apache.hadoop.mapreduce.TaskTrackerInfo;
import org.apache.hadoop.mapreduce.Cluster.JobTrackerStatus;
import org.apache.hadoop.util.StringInterner;
@@ -175,7 +174,7 @@ public class ClusterStatus implements Wr
}
- public static final int UNINITIALIZED_MEMORY_VALUE = -1;
+ public static final long UNINITIALIZED_MEMORY_VALUE = -1;
private int numActiveTrackers;
private Collection<String> activeTrackers = new ArrayList<String>();
@@ -316,7 +315,33 @@ public class ClusterStatus implements Wr
}
return blacklistedTrackers;
}
-
+
+ /**
+ * Get the names of graylisted task trackers in the cluster.
+ *
+ * The gray list of trackers is no longer available on M/R 2.x. The function
+ * is kept to be compatible with M/R 1.x applications.
+ *
+ * @return an empty graylisted task trackers in the cluster.
+ */
+ @Deprecated
+ public Collection<String> getGraylistedTrackerNames() {
+ return Collections.emptySet();
+ }
+
+ /**
+ * Get the number of graylisted task trackers in the cluster.
+ *
+ * The gray list of trackers is no longer available on M/R 2.x. The function
+ * is kept to be compatible with M/R 1.x applications.
+ *
+ * @return 0 graylisted task trackers in the cluster.
+ */
+ @Deprecated
+ public int getGraylistedTrackers() {
+ return 0;
+ }
+
/**
* Get the number of blacklisted task trackers in the cluster.
*
@@ -413,6 +438,20 @@ public class ClusterStatus implements Wr
return blacklistedTrackersInfo;
}
+ /**
+ * Get the current state of the <code>JobTracker</code>,
+ * as {@link JobTracker.State}
+ *
+ * {@link JobTracker.State} should no longer be used on M/R 2.x. The function
+ * is kept to be compatible with M/R 1.x applications.
+ *
+ * @return the invalid state of the <code>JobTracker</code>.
+ */
+ @Deprecated
+ public JobTracker.State getJobTrackerState() {
+ return JobTracker.State.RUNNING;
+ }
+
public void write(DataOutput out) throws IOException {
if (activeTrackers.size() == 0) {
out.writeInt(numActiveTrackers);
