MAPREDUCE-2455. Remove deprecated JobTracker.State in favour of JobTrackerStatus.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/mapreduce/trunk@1129771 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index a040af3..f0e9858 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,9 @@
INCOMPATIBLE CHANGES
+ MAPREDUCE-2455. Remove deprecated JobTracker.State in favour of
+ JobTrackerStatus. (tomwhite)
+
NEW FEATURES
MAPREDUCE-2408. [Gridmix] Compression emulation in Gridmix. (amarrk)
diff --git a/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/CapacityTestUtils.java b/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/CapacityTestUtils.java
index 32defa9..c14fca2 100644
--- a/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/CapacityTestUtils.java
+++ b/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/CapacityTestUtils.java
@@ -37,6 +37,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.BytesWritable;
+import org.apache.hadoop.mapreduce.Cluster.JobTrackerStatus;
import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.QueueState;
import static org.apache.hadoop.mapred.QueueManager.toFullPropertyName;
@@ -670,7 +671,7 @@
ttExpiryInterval, maps, reduces,
numTrackers * maxMapTasksPerTracker,
numTrackers * maxReduceTasksPerTracker,
- JobTracker.State.RUNNING);
+ JobTrackerStatus.RUNNING);
}
public int getNumberOfUniqueHosts() {
diff --git a/src/contrib/fairscheduler/src/test/org/apache/hadoop/mapred/TestFairScheduler.java b/src/contrib/fairscheduler/src/test/org/apache/hadoop/mapred/TestFairScheduler.java
index 32f39df..f4e965d 100644
--- a/src/contrib/fairscheduler/src/test/org/apache/hadoop/mapred/TestFairScheduler.java
+++ b/src/contrib/fairscheduler/src/test/org/apache/hadoop/mapred/TestFairScheduler.java
@@ -38,6 +38,7 @@
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.BytesWritable;
import org.apache.hadoop.mapred.FairScheduler.JobInfo;
+import org.apache.hadoop.mapreduce.Cluster.JobTrackerStatus;
import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapred.FakeObjectUtilities.FakeJobHistory;
import org.apache.hadoop.mapred.JobInProgress.KillInterruptedException;
@@ -374,7 +375,7 @@
ttExpiryInterval, maps, reduces,
numTrackers * maxMapTasksPerTracker,
numTrackers * maxReduceTasksPerTracker,
- JobTracker.State.RUNNING);
+ JobTrackerStatus.RUNNING);
}
@Override
diff --git a/src/java/org/apache/hadoop/mapred/ClusterStatus.java b/src/java/org/apache/hadoop/mapred/ClusterStatus.java
index 63de0fb..7c8f8eb 100644
--- a/src/java/org/apache/hadoop/mapred/ClusterStatus.java
+++ b/src/java/org/apache/hadoop/mapred/ClusterStatus.java
@@ -185,7 +185,7 @@
private int reduce_tasks;
private int max_map_tasks;
private int max_reduce_tasks;
- private JobTracker.State state;
+ private JobTrackerStatus status;
private Collection<BlackListInfo> blacklistedTrackersInfo =
new ArrayList<BlackListInfo>();
@@ -201,13 +201,13 @@
* @param reduces no. of currently running reduce-tasks in the cluster
* @param maxMaps the maximum no. of map tasks in the cluster
* @param maxReduces the maximum no. of reduce tasks in the cluster
- * @param state the {@link JobTracker.State} of the <code>JobTracker</code>
+ * @param status the {@link JobTrackerStatus} of the <code>JobTracker</code>
*/
ClusterStatus(int trackers, int blacklists, long ttExpiryInterval,
int maps, int reduces,
- int maxMaps, int maxReduces, JobTracker.State state) {
+ int maxMaps, int maxReduces, JobTrackerStatus status) {
this(trackers, blacklists, ttExpiryInterval, maps, reduces, maxMaps,
- maxReduces, state, 0);
+ maxReduces, status, 0);
}
/**
@@ -220,12 +220,12 @@
* @param reduces no. of currently running reduce-tasks in the cluster
* @param maxMaps the maximum no. of map tasks in the cluster
* @param maxReduces the maximum no. of reduce tasks in the cluster
- * @param state the {@link JobTracker.State} of the <code>JobTracker</code>
+ * @param status the {@link JobTrackerStatus} of the <code>JobTracker</code>
* @param numDecommissionedNodes number of decommission trackers
*/
ClusterStatus(int trackers, int blacklists, long ttExpiryInterval,
int maps, int reduces, int maxMaps, int maxReduces,
- JobTracker.State state, int numDecommissionedNodes) {
+ JobTrackerStatus status, int numDecommissionedNodes) {
numActiveTrackers = trackers;
numBlacklistedTrackers = blacklists;
this.numExcludedNodes = numDecommissionedNodes;
@@ -234,7 +234,7 @@
reduce_tasks = reduces;
max_map_tasks = maxMaps;
max_reduce_tasks = maxReduces;
- this.state = state;
+ this.status = status;
}
/**
@@ -247,15 +247,15 @@
* @param reduces no. of currently running reduce-tasks in the cluster
* @param maxMaps the maximum no. of map tasks in the cluster
* @param maxReduces the maximum no. of reduce tasks in the cluster
- * @param state the {@link JobTracker.State} of the <code>JobTracker</code>
+ * @param status the {@link JobTrackerStatus} of the <code>JobTracker</code>
*/
ClusterStatus(Collection<String> activeTrackers,
Collection<BlackListInfo> blacklistedTrackers,
long ttExpiryInterval,
int maps, int reduces, int maxMaps, int maxReduces,
- JobTracker.State state) {
+ JobTrackerStatus status) {
this(activeTrackers, blacklistedTrackers, ttExpiryInterval, maps, reduces,
- maxMaps, maxReduces, state, 0);
+ maxMaps, maxReduces, status, 0);
}
@@ -270,16 +270,16 @@
* @param reduces no. of currently running reduce-tasks in the cluster
* @param maxMaps the maximum no. of map tasks in the cluster
* @param maxReduces the maximum no. of reduce tasks in the cluster
- * @param state the {@link JobTracker.State} of the <code>JobTracker</code>
+ * @param status the {@link JobTrackerStatus} of the <code>JobTracker</code>
* @param numDecommissionNodes number of decommission trackers
*/
ClusterStatus(Collection<String> activeTrackers,
Collection<BlackListInfo> blackListedTrackerInfo, long ttExpiryInterval,
int maps, int reduces, int maxMaps, int maxReduces,
- JobTracker.State state, int numDecommissionNodes) {
+ JobTrackerStatus status, int numDecommissionNodes) {
this(activeTrackers.size(), blackListedTrackerInfo.size(),
- ttExpiryInterval, maps, reduces, maxMaps, maxReduces, state,
+ ttExpiryInterval, maps, reduces, maxMaps, maxReduces, status,
numDecommissionNodes);
this.activeTrackers = activeTrackers;
this.blacklistedTrackersInfo = blackListedTrackerInfo;
@@ -378,24 +378,12 @@
}
/**
- * Get the current state of the <code>JobTracker</code>,
- * as {@link JobTracker.State}
- *
- * @return the current state of the <code>JobTracker</code>.
- * @deprecated Use {@link #getJobTrackerStatus()} instead.
- */
- @Deprecated
- public JobTracker.State getJobTrackerState() {
- return state;
- }
-
- /**
* Get the JobTracker's status.
*
* @return {@link JobTrackerStatus} of the JobTracker
*/
public JobTrackerStatus getJobTrackerStatus() {
- return JobTrackerStatus.valueOf(state.name());
+ return status;
}
/**
@@ -435,7 +423,7 @@
out.writeInt(reduce_tasks);
out.writeInt(max_map_tasks);
out.writeInt(max_reduce_tasks);
- WritableUtils.writeEnum(out, state);
+ WritableUtils.writeEnum(out, status);
}
public void readFields(DataInput in) throws IOException {
@@ -462,6 +450,6 @@
reduce_tasks = in.readInt();
max_map_tasks = in.readInt();
max_reduce_tasks = in.readInt();
- state = WritableUtils.readEnum(in, JobTracker.State.class);
+ status = WritableUtils.readEnum(in, JobTrackerStatus.class);
}
}
diff --git a/src/java/org/apache/hadoop/mapred/JobClient.java b/src/java/org/apache/hadoop/mapred/JobClient.java
index 3b5f84b..ec1c731 100644
--- a/src/java/org/apache/hadoop/mapred/JobClient.java
+++ b/src/java/org/apache/hadoop/mapred/JobClient.java
@@ -686,7 +686,7 @@
metrics.getOccupiedMapSlots(),
metrics.getOccupiedReduceSlots(), metrics.getMapSlotCapacity(),
metrics.getReduceSlotCapacity(),
- JobTracker.State.valueOf(cluster.getJobTrackerState().name()),
+ cluster.getJobTrackerStatus(),
metrics.getDecommissionedTaskTrackerCount());
} catch (InterruptedException ie) {
throw new IOException(ie);
@@ -730,7 +730,7 @@
cluster.getTaskTrackerExpiryInterval(), metrics.getOccupiedMapSlots(),
metrics.getOccupiedReduceSlots(), metrics.getMapSlotCapacity(),
metrics.getReduceSlotCapacity(),
- JobTracker.State.valueOf(cluster.getJobTrackerState().name()));
+ cluster.getJobTrackerStatus());
} catch (InterruptedException ie) {
throw new IOException(ie);
}
diff --git a/src/java/org/apache/hadoop/mapred/JobTracker.java b/src/java/org/apache/hadoop/mapred/JobTracker.java
index bd93e69..6e6d973 100644
--- a/src/java/org/apache/hadoop/mapred/JobTracker.java
+++ b/src/java/org/apache/hadoop/mapred/JobTracker.java
@@ -3255,7 +3255,7 @@
totalReduces,
totalMapTaskCapacity,
totalReduceTaskCapacity,
- state, getExcludedNodes().size()
+ JobTrackerStatus.valueOf(state.name()), getExcludedNodes().size()
);
} else {
return new ClusterStatus(taskTrackers.size() -
@@ -3266,7 +3266,7 @@
totalReduces,
totalMapTaskCapacity,
totalReduceTaskCapacity,
- state, getExcludedNodes().size());
+ JobTrackerStatus.valueOf(state.name()), getExcludedNodes().size());
}
}
}
diff --git a/src/test/mapred/org/apache/hadoop/mapred/FakeObjectUtilities.java b/src/test/mapred/org/apache/hadoop/mapred/FakeObjectUtilities.java
index 87ea9f5..545482c 100644
--- a/src/test/mapred/org/apache/hadoop/mapred/FakeObjectUtilities.java
+++ b/src/test/mapred/org/apache/hadoop/mapred/FakeObjectUtilities.java
@@ -29,6 +29,7 @@
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.mapred.TaskStatus.Phase;
+import org.apache.hadoop.mapreduce.Cluster.JobTrackerStatus;
import org.apache.hadoop.mapreduce.TaskType;
import org.apache.hadoop.mapreduce.jobhistory.HistoryEvent;
import org.apache.hadoop.mapreduce.jobhistory.JobHistory;
@@ -66,7 +67,7 @@
return new ClusterStatus(
taskTrackers().size() - getBlacklistedTrackerCount(),
getBlacklistedTrackerCount(), 0, 0, 0, totalSlots/2, totalSlots/2,
- JobTracker.State.RUNNING, 0);
+ JobTrackerStatus.RUNNING, 0);
}
public void setNumSlots(int totalSlots) {
diff --git a/src/test/mapred/org/apache/hadoop/mapred/TestJobInProgress.java b/src/test/mapred/org/apache/hadoop/mapred/TestJobInProgress.java
index c6e32ae..9b0d64d 100644
--- a/src/test/mapred/org/apache/hadoop/mapred/TestJobInProgress.java
+++ b/src/test/mapred/org/apache/hadoop/mapred/TestJobInProgress.java
@@ -41,6 +41,7 @@
import org.apache.hadoop.mapred.FakeObjectUtilities.FakeJobTracker;
import org.apache.hadoop.mapred.TaskStatus.Phase;
import org.apache.hadoop.mapred.UtilsForTests.FakeClock;
+import org.apache.hadoop.mapreduce.Cluster.JobTrackerStatus;
import org.apache.hadoop.mapreduce.JobCounter;
import org.apache.hadoop.mapreduce.TaskType;
import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig;
@@ -317,7 +318,7 @@
verify(jspy, times(4)).setFirstTaskLaunchTime(any(TaskInProgress.class));
ClusterStatus cspy = spy(new ClusterStatus(4, 0, 0, 0, 0, 4, 4,
- JobTracker.State.RUNNING, 0));
+ JobTrackerStatus.RUNNING, 0));
JobInProgress.JobSummary.logJobSummary(jspy, cspy);
diff --git a/src/test/mapred/org/apache/hadoop/mapred/TestJobQueueTaskScheduler.java b/src/test/mapred/org/apache/hadoop/mapred/TestJobQueueTaskScheduler.java
index 3d1ed8d..dd297b3 100644
--- a/src/test/mapred/org/apache/hadoop/mapred/TestJobQueueTaskScheduler.java
+++ b/src/test/mapred/org/apache/hadoop/mapred/TestJobQueueTaskScheduler.java
@@ -28,6 +28,7 @@
import org.apache.hadoop.io.BytesWritable;
import org.apache.hadoop.mapred.JobStatusChangeEvent.EventType;
+import org.apache.hadoop.mapreduce.Cluster.JobTrackerStatus;
import org.apache.hadoop.mapreduce.TaskType;
import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig;
import org.apache.hadoop.mapreduce.server.jobtracker.TaskTracker;
@@ -156,7 +157,7 @@
maps, reduces,
numTrackers * maxMapTasksPerTracker,
numTrackers * maxReduceTasksPerTracker,
- JobTracker.State.RUNNING);
+ JobTrackerStatus.RUNNING);
}
@Override
diff --git a/src/test/mapred/org/apache/hadoop/mapred/TestParallelInitialization.java b/src/test/mapred/org/apache/hadoop/mapred/TestParallelInitialization.java
index 546af87..4e812ad 100644
--- a/src/test/mapred/org/apache/hadoop/mapred/TestParallelInitialization.java
+++ b/src/test/mapred/org/apache/hadoop/mapred/TestParallelInitialization.java
@@ -30,6 +30,7 @@
import org.apache.hadoop.mapred.FakeObjectUtilities.FakeJobHistory;
import org.apache.hadoop.mapred.JobInProgress.KillInterruptedException;
import org.apache.hadoop.mapred.JobStatusChangeEvent.EventType;
+import org.apache.hadoop.mapreduce.Cluster.JobTrackerStatus;
import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig;
public class TestParallelInitialization extends TestCase {
@@ -107,7 +108,7 @@
maps, reduces,
numTrackers * maxMapTasksPerTracker,
numTrackers * maxReduceTasksPerTracker,
- JobTracker.State.RUNNING);
+ JobTrackerStatus.RUNNING);
}
public int getNumberOfUniqueHosts() {
diff --git a/src/webapps/job/jobtracker.jsp b/src/webapps/job/jobtracker.jsp
index 38bfd9f..d6d98d7 100644
--- a/src/webapps/job/jobtracker.jsp
+++ b/src/webapps/job/jobtracker.jsp
@@ -124,7 +124,7 @@
</ul>
</div>
-<b>State:</b> <%= status.getJobTrackerState() %><br>
+<b>State:</b> <%= status.getJobTrackerStatus() %><br>
<b>Started:</b> <%= new Date(tracker.getStartTime())%><br>
<b>Version:</b> <%= VersionInfo.getVersion()%>,
<%= VersionInfo.getRevision()%><br>
diff --git a/src/webapps/job/jobtracker.jspx b/src/webapps/job/jobtracker.jspx
index 791e5ef..be7324d 100644
--- a/src/webapps/job/jobtracker.jspx
+++ b/src/webapps/job/jobtracker.jspx
@@ -49,7 +49,7 @@
<tracker_name><jsp:expression>trackerName</jsp:expression></tracker_name>
<tracker>
- <state><jsp:expression>tracker.getClusterStatus().getJobTrackerState()</jsp:expression></state>
+ <state><jsp:expression>tracker.getClusterStatus().getJobTrackerStatus()</jsp:expression></state>
<started><jsp:expression>new Date(tracker.getStartTime())</jsp:expression></started>
<version><jsp:expression>VersionInfo.getVersion()</jsp:expression></version>
<revision><jsp:expression>VersionInfo.getRevision()</jsp:expression></revision>
