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 sh...@apache.org on 2010/06/01 07:24:37 UTC
svn commit: r949933 - in /hadoop/mapreduce/branches/branch-0.21: ./
src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/
src/java/org/apache/hadoop/mapred/ src/java/org/apache/hadoop/mapreduce/
src/java/org/apache/hadoop/mapreduce/task/ src/j...
Author: sharad
Date: Tue Jun 1 05:24:36 2010
New Revision: 949933
URL: http://svn.apache.org/viewvc?rev=949933&view=rev
Log:
MAPREDUCE-118. Merge -r 949930:949931 from trunk.
Modified:
hadoop/mapreduce/branches/branch-0.21/CHANGES.txt
hadoop/mapreduce/branches/branch-0.21/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/Gridmix.java
hadoop/mapreduce/branches/branch-0.21/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobMonitor.java
hadoop/mapreduce/branches/branch-0.21/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobSubmitter.java
hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobClient.java
hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/LocalJobRunner.java
hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/Job.java
hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/JobSubmitter.java
hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/JobContextImpl.java
hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/tools/CLI.java
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestJobDirCleanup.java
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestJobInProgressListener.java
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestQueueManagerWithJobTracker.java
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestTaskTrackerMemoryManager.java
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestWebUIAuthorization.java
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapreduce/TestJobACLs.java
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapreduce/TestMRJobClient.java
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapreduce/TestNoJobSetupCleanup.java
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapreduce/lib/output/TestJobOutputCommitter.java
Modified: hadoop/mapreduce/branches/branch-0.21/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/CHANGES.txt?rev=949933&r1=949932&r2=949933&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/branch-0.21/CHANGES.txt Tue Jun 1 05:24:36 2010
@@ -1573,3 +1573,5 @@ Release 0.21.0 - Unreleased
MAPREDUCE-1372. ConcurrentModificationException in JobInProgress.
(Dick King and Amareshwari Sriramadasu via tomwhite)
+
+ MAPREDUCE-118. Fix Job.getJobID(). (Amareshwari Sriramadasu via sharad)
Modified: hadoop/mapreduce/branches/branch-0.21/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/Gridmix.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/Gridmix.java?rev=949933&r1=949932&r2=949933&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/Gridmix.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/Gridmix.java Tue Jun 1 05:24:36 2010
@@ -296,7 +296,7 @@ public class Gridmix extends Configured
try {
if (!job.isComplete()) {
job.killJob();
- LOG.info("Killed " + job.getJobName() + " (" + job.getID() + ")");
+ LOG.info("Killed " + job.getJobName() + " (" + job.getJobID() + ")");
} else {
if (job.isSuccessful()) {
monitor.onSuccess(job);
Modified: hadoop/mapreduce/branches/branch-0.21/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobMonitor.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobMonitor.java?rev=949933&r1=949932&r2=949933&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobMonitor.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobMonitor.java Tue Jun 1 05:24:36 2010
@@ -92,14 +92,14 @@ class JobMonitor implements Gridmix.Comp
* Temporary hook for recording job success.
*/
protected void onSuccess(Job job) {
- LOG.info(job.getJobName() + " (" + job.getID() + ")" + " success");
+ LOG.info(job.getJobName() + " (" + job.getJobID() + ")" + " success");
}
/**
* Temporary hook for recording job failure.
*/
protected void onFailure(Job job) {
- LOG.info(job.getJobName() + " (" + job.getID() + ")" + " failure");
+ LOG.info(job.getJobName() + " (" + job.getJobID() + ")" + " failure");
}
/**
Modified: hadoop/mapreduce/branches/branch-0.21/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobSubmitter.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobSubmitter.java?rev=949933&r1=949932&r2=949933&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobSubmitter.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobSubmitter.java Tue Jun 1 05:24:36 2010
@@ -99,7 +99,7 @@ class JobSubmitter implements Gridmix.Co
// submit job
monitor.add(job.call());
LOG.debug("SUBMIT " + job + "@" + System.currentTimeMillis() +
- " (" + job.getJob().getID() + ")");
+ " (" + job.getJob().getJobID() + ")");
} catch (IOException e) {
LOG.warn("Failed to submit " + job.getJob().getJobName(), e);
if (e.getCause() instanceof ClosedByInterruptException) {
Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobClient.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobClient.java?rev=949933&r1=949932&r2=949933&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobClient.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobClient.java Tue Jun 1 05:24:36 2010
@@ -39,7 +39,6 @@ import org.apache.hadoop.mapreduce.filec
import org.apache.hadoop.mapreduce.security.token.delegation.DelegationTokenIdentifier;
import org.apache.hadoop.mapreduce.tools.CLI;
import org.apache.hadoop.mapreduce.util.ConfigUtil;
-import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
@@ -175,7 +174,7 @@ public class JobClient extends CLI {
* An identifier for the job
*/
public JobID getID() {
- return JobID.downgrade(job.getID());
+ return JobID.downgrade(job.getJobID());
}
/** @deprecated This method is deprecated and will be removed. Applications should
Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/LocalJobRunner.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/LocalJobRunner.java?rev=949933&r1=949932&r2=949933&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/LocalJobRunner.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/LocalJobRunner.java Tue Jun 1 05:24:36 2010
@@ -594,8 +594,8 @@ public class LocalJobRunner implements C
}
public void killJob(org.apache.hadoop.mapreduce.JobID id) {
- jobs.get(id).killed = true;
- jobs.get(id).interrupt();
+ jobs.get(JobID.downgrade(id)).killed = true;
+ jobs.get(JobID.downgrade(id)).interrupt();
}
public void setJobPriority(org.apache.hadoop.mapreduce.JobID id,
Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/Job.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/Job.java?rev=949933&r1=949932&r2=949933&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/Job.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/Job.java Tue Jun 1 05:24:36 2010
@@ -147,8 +147,9 @@ public class Job extends JobContextImpl
Job(Cluster cluster, JobStatus status,
Configuration conf) throws IOException {
this(cluster, conf);
- state = JobState.RUNNING;
+ setJobID(status.getJobID());
this.status = status;
+ state = JobState.RUNNING;
}
public static Job getInstance(Cluster cluster) throws IOException {
@@ -200,15 +201,6 @@ public class Job extends JobContextImpl
updateStatus();
return status;
}
- /**
- * Get the job identifier.
- *
- * @return the job identifier.
- */
- public JobID getID() {
- ensureState(JobState.RUNNING);
- return status.getJobID();
- }
/**
* Returns the current state of the Job.
@@ -347,7 +339,7 @@ public class Job extends JobContextImpl
public TaskReport[] getTaskReports(TaskType type)
throws IOException, InterruptedException {
ensureState(JobState.RUNNING);
- return cluster.getClient().getTaskReports(getID(), type);
+ return cluster.getClient().getTaskReports(getJobID(), type);
}
/**
@@ -435,7 +427,7 @@ public class Job extends JobContextImpl
*/
public void killJob() throws IOException, InterruptedException {
ensureState(JobState.RUNNING);
- cluster.getClient().killJob(getID());
+ cluster.getClient().killJob(getJobID());
}
/**
@@ -450,7 +442,7 @@ public class Job extends JobContextImpl
org.apache.hadoop.mapred.JobPriority.valueOf(priority.name()));
} else {
ensureState(JobState.RUNNING);
- cluster.getClient().setJobPriority(getID(), priority.toString());
+ cluster.getClient().setJobPriority(getJobID(), priority.toString());
}
}
@@ -465,7 +457,7 @@ public class Job extends JobContextImpl
public TaskCompletionEvent[] getTaskCompletionEvents(int startFrom,
int numEvents) throws IOException, InterruptedException {
ensureState(JobState.RUNNING);
- return cluster.getClient().getTaskCompletionEvents(getID(),
+ return cluster.getClient().getTaskCompletionEvents(getJobID(),
startFrom, numEvents);
}
@@ -502,7 +494,7 @@ public class Job extends JobContextImpl
public Counters getCounters()
throws IOException, InterruptedException {
ensureState(JobState.RUNNING);
- return cluster.getClient().getJobCounters(getID());
+ return cluster.getClient().getJobCounters(getJobID());
}
/**
@@ -1010,7 +1002,7 @@ public class Job extends JobContextImpl
Job.TaskStatusFilter filter;
Configuration clientConf = cluster.getConf();
filter = Job.getTaskOutputFilter(clientConf);
- JobID jobId = getID();
+ JobID jobId = getJobID();
LOG.info("Running job: " + jobId);
int eventCounter = 0;
boolean profiling = getProfileEnabled();
Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/JobSubmitter.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/JobSubmitter.java?rev=949933&r1=949932&r2=949933&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/JobSubmitter.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/JobSubmitter.java Tue Jun 1 05:24:36 2010
@@ -318,6 +318,7 @@ class JobSubmitter {
//configure the command line options correctly on the submitting dfs
Configuration conf = job.getConfiguration();
JobID jobId = submitClient.getNewJobID();
+ job.setJobID(jobId);
Path submitJobDir = new Path(jobStagingArea, jobId.toString());
JobStatus status = null;
try {
Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/JobContextImpl.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/JobContextImpl.java?rev=949933&r1=949932&r2=949933&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/JobContextImpl.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/JobContextImpl.java Tue Jun 1 05:24:36 2010
@@ -49,7 +49,7 @@ import org.apache.hadoop.mapreduce.lib.p
public class JobContextImpl implements JobContext {
protected final org.apache.hadoop.mapred.JobConf conf;
- private final JobID jobId;
+ private JobID jobId;
public JobContextImpl(Configuration conf, JobID jobId) {
this.conf = new org.apache.hadoop.mapred.JobConf(conf);
@@ -73,6 +73,13 @@ public class JobContextImpl implements J
}
/**
+ * Set the JobID.
+ */
+ public void setJobID(JobID jobId) {
+ this.jobId = jobId;
+ }
+
+ /**
* Get configured the number of reduce tasks for this job. Defaults to
* <code>1</code>.
* @return the number of reduce tasks for this job.
Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/tools/CLI.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/tools/CLI.java?rev=949933&r1=949932&r2=949933&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/tools/CLI.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/tools/CLI.java Tue Jun 1 05:24:36 2010
@@ -217,7 +217,7 @@ public class CLI extends Configured impl
if (submitJobFile != null) {
Job job = Job.getInstance(cluster, new JobConf(submitJobFile));
job.submit();
- System.out.println("Created job " + job.getID());
+ System.out.println("Created job " + job.getJobID());
exitCode = 0;
} else if (getStatus) {
Job job = cluster.getJob(JobID.forName(jobid));
@@ -423,7 +423,7 @@ public class CLI extends Configured impl
throws IOException, InterruptedException {
TaskCompletionEvent[] events = job.
getTaskCompletionEvents(fromEventId, numEvents);
- System.out.println("Task completion events for " + job.getID());
+ System.out.println("Task completion events for " + job.getJobID());
System.out.println("Number of events (from " + fromEventId + ") are: "
+ events.length);
for(TaskCompletionEvent event: events) {
@@ -529,7 +529,7 @@ public class CLI extends Configured impl
System.out.println("JobId\tState\tStartTime\t" +
"UserName\tPriority\tSchedulingInfo");
for (Job job : jobs) {
- System.out.printf("%s\t%s\t%d\t%s\t%s\t%s\n", job.getID().toString(),
+ System.out.printf("%s\t%s\t%d\t%s\t%s\t%s\n", job.getJobID().toString(),
job.getJobState(), job.getStartTime(),
job.getUser(), job.getPriority().name(), job.getSchedulingInfo());
}
Modified: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestJobDirCleanup.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestJobDirCleanup.java?rev=949933&r1=949932&r2=949933&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestJobDirCleanup.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestJobDirCleanup.java Tue Jun 1 05:24:36 2010
@@ -42,7 +42,7 @@ public class TestJobDirCleanup extends T
sleep.setConf(conf);
Job job = sleep.createJob(1, 10, 1000, 1, 10000, 1);
job.waitForCompletion(true);
- return job.getID();
+ return job.getJobID();
}
public void testJobDirCleanup() throws Exception {
Modified: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestJobInProgressListener.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestJobInProgressListener.java?rev=949933&r1=949932&r2=949933&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestJobInProgressListener.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestJobInProgressListener.java Tue Jun 1 05:24:36 2010
@@ -387,7 +387,7 @@ public class TestJobInProgressListener e
j.submit();
j.waitForCompletion(true);
- JobID id = (org.apache.hadoop.mapred.JobID)j.getID();
+ JobID id = JobID.downgrade(j.getJobID());
// check if the job is in the waiting queue
assertFalse("Missing event notification on no-set-cleanup no task job",
Modified: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestQueueManagerWithJobTracker.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestQueueManagerWithJobTracker.java?rev=949933&r1=949932&r2=949933&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestQueueManagerWithJobTracker.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestQueueManagerWithJobTracker.java Tue Jun 1 05:24:36 2010
@@ -176,7 +176,7 @@ public class TestQueueManagerWithJobTrac
//signal to the job.
jip = tracker.getJob(org.apache.hadoop.mapred.JobID.downgrade(jobID));
tracker.initJob(jip);
- tracker.killJob(job.getID());
+ tracker.killJob(job.getJobID());
// kill the job by the user who submitted the job
assertEquals("job submitted for u1 and queue p1:p11 is not killed.",
cluster.getJob(jobID).getStatus().getState(), (State.KILLED));
Modified: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestTaskTrackerMemoryManager.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestTaskTrackerMemoryManager.java?rev=949933&r1=949932&r2=949933&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestTaskTrackerMemoryManager.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestTaskTrackerMemoryManager.java Tue Jun 1 05:24:36 2010
@@ -396,9 +396,9 @@ public class TestTaskTrackerMemoryManage
while (true) {
List<TaskReport> allTaskReports = new ArrayList<TaskReport>();
allTaskReports.addAll(Arrays.asList(jClient
- .getSetupTaskReports((org.apache.hadoop.mapred.JobID) job.getID())));
+ .getSetupTaskReports(JobID.downgrade(job.getJobID()))));
allTaskReports.addAll(Arrays.asList(jClient
- .getMapTaskReports((org.apache.hadoop.mapred.JobID) job.getID())));
+ .getMapTaskReports(JobID.downgrade(job.getJobID()))));
for (TaskReport tr : allTaskReports) {
String[] diag = tr.getDiagnostics();
for (String str : diag) {
@@ -566,9 +566,9 @@ public class TestTaskTrackerMemoryManage
while (true) {
List<TaskReport> allTaskReports = new ArrayList<TaskReport>();
allTaskReports.addAll(Arrays.asList(jClient
- .getSetupTaskReports((org.apache.hadoop.mapred.JobID) job.getID())));
+ .getSetupTaskReports(JobID.downgrade(job.getJobID()))));
allTaskReports.addAll(Arrays.asList(jClient
- .getMapTaskReports((org.apache.hadoop.mapred.JobID) job.getID())));
+ .getMapTaskReports(JobID.downgrade(job.getJobID()))));
for (TaskReport tr : allTaskReports) {
String[] diag = tr.getDiagnostics();
for (String str : diag) {
Modified: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestWebUIAuthorization.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestWebUIAuthorization.java?rev=949933&r1=949932&r2=949933&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestWebUIAuthorization.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestWebUIAuthorization.java Tue Jun 1 05:24:36 2010
@@ -185,7 +185,7 @@ public class TestWebUIAuthorization exte
private TaskID getTIPId(MiniMRCluster cluster,
org.apache.hadoop.mapreduce.JobID jobid) throws Exception {
JobClient client = new JobClient(cluster.createJobConf());
- JobID jobId = (JobID) jobid;
+ JobID jobId = JobID.downgrade(jobid);
TaskReport[] mapReports = null;
TaskID tipId = null;
@@ -214,7 +214,7 @@ public class TestWebUIAuthorization exte
JobConf conf, String jtURL, String jobTrackerJSP, String user)
throws Exception {
Job job = startSleepJobAsUser(jobSubmitter, conf);
- org.apache.hadoop.mapreduce.JobID jobid = job.getID();
+ org.apache.hadoop.mapreduce.JobID jobid = job.getJobID();
getTIPId(cluster, jobid);// wait till the map task is started
// jobDetailsJSP killJob url
String url = jtURL + "/jobdetails.jsp?" +
@@ -283,7 +283,7 @@ public class TestWebUIAuthorization exte
}
});
- org.apache.hadoop.mapreduce.JobID jobid = job.getID();
+ org.apache.hadoop.mapreduce.JobID jobid = job.getJobID();
String historyFileName = job.getStatus().getHistoryFile();
String jtURL = "http://localhost:" + infoPort;
@@ -407,7 +407,7 @@ public class TestWebUIAuthorization exte
String jobTrackerJSP = jtURL + "/jobtracker.jsp?a=b";
Job job = startSleepJobAsUser(jobSubmitter, conf);
- org.apache.hadoop.mapreduce.JobID jobid = job.getID();
+ org.apache.hadoop.mapreduce.JobID jobid = job.getJobID();
getTIPId(cluster, jobid);// wait till the map task is started
// jobDetailsJSPKillJobAction url
String url = jtURL + "/jobdetails.jsp?" +
@@ -453,7 +453,7 @@ public class TestWebUIAuthorization exte
throws Exception {
String jobTrackerJSP = jtURL + "/jobtracker.jsp?a=b";
Job job = startSleepJobAsUser(jobSubmitter, conf);
- org.apache.hadoop.mapreduce.JobID jobid = job.getID();
+ org.apache.hadoop.mapreduce.JobID jobid = job.getJobID();
getTIPId(cluster, jobid);// wait till the map task is started
// jobTrackerJSP killJob url
String url = jobTrackerJSP +
@@ -497,19 +497,19 @@ public class TestWebUIAuthorization exte
// Out of these 4 users, only jobSubmitter can do killJob on 1st job
conf.set(MRJobConfig.JOB_ACL_MODIFY_JOB, "");
Job job1 = startSleepJobAsUser(jobSubmitter, conf);
- org.apache.hadoop.mapreduce.JobID jobid = job1.getID();
+ org.apache.hadoop.mapreduce.JobID jobid = job1.getJobID();
getTIPId(cluster, jobid);// wait till the map task is started
url = url.concat("&jobCheckBox=" + jobid.toString());
// start 2nd job.
// Out of these 4 users, only viewColleague can do killJob on 2nd job
Job job2 = startSleepJobAsUser(viewColleague, conf);
- jobid = job2.getID();
+ jobid = job2.getJobID();
getTIPId(cluster, jobid);// wait till the map task is started
url = url.concat("&jobCheckBox=" + jobid.toString());
// start 3rd job.
// Out of these 4 users, only modifyColleague can do killJob on 3rd job
Job job3 = startSleepJobAsUser(modifyColleague, conf);
- jobid = job3.getID();
+ jobid = job3.getJobID();
getTIPId(cluster, jobid);// wait till the map task is started
url = url.concat("&jobCheckBox=" + jobid.toString());
// start 4rd job.
@@ -517,7 +517,7 @@ public class TestWebUIAuthorization exte
// can do killJob on 4th job
conf.set(MRJobConfig.JOB_ACL_MODIFY_JOB, viewColleague);
Job job4 = startSleepJobAsUser(viewAndModifyColleague, conf);
- jobid = job4.getID();
+ jobid = job4.getJobID();
getTIPId(cluster, jobid);// wait till the map task is started
url = url.concat("&jobCheckBox=" + jobid.toString());
@@ -590,7 +590,7 @@ public class TestWebUIAuthorization exte
Job job = startSleepJobAsUser(jobSubmitter, conf);
- org.apache.hadoop.mapreduce.JobID jobid = job.getID();
+ org.apache.hadoop.mapreduce.JobID jobid = job.getJobID();
String jtURL = "http://localhost:" + infoPort;
Modified: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapreduce/TestJobACLs.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapreduce/TestJobACLs.java?rev=949933&r1=949932&r2=949933&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapreduce/TestJobACLs.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapreduce/TestJobACLs.java Tue Jun 1 05:24:36 2010
@@ -127,7 +127,7 @@ public class TestJobACLs {
// Submit the job as user1
Job job = submitJobAsUser(myConf, "user1");
- final JobID jobId = job.getID();
+ final JobID jobId = job.getJobID();
// Try operations as an unauthorized user.
verifyViewJobAsUnauthorizedUser(myConf, jobId, "user2");
@@ -261,7 +261,7 @@ public class TestJobACLs {
// Submit the job as user1
Job job = submitJobAsUser(myConf, "user1");
- final JobID jobId = job.getID();
+ final JobID jobId = job.getJobID();
// Try operations as an unauthorized user.
verifyModifyJobAsUnauthorizedUser(myConf, jobId, "user2");
@@ -369,7 +369,7 @@ public class TestJobACLs {
// Submit the job as user1
Job job = submitJobAsUser(myConf, "user1");
- final JobID jobId = job.getID();
+ final JobID jobId = job.getJobID();
// Kill the job and wait till it is actually killed so that it is written to
// CompletedJobStore
Modified: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapreduce/TestMRJobClient.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapreduce/TestMRJobClient.java?rev=949933&r1=949932&r2=949933&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapreduce/TestMRJobClient.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapreduce/TestMRJobClient.java Tue Jun 1 05:24:36 2010
@@ -68,7 +68,7 @@ public class TestMRJobClient extends Clu
public void testJobClient() throws Exception {
Configuration conf = createJobConf();
Job job = runJob(conf);
- String jobId = job.getID().toString();
+ String jobId = job.getJobID().toString();
testGetCounter(jobId, conf);
testJobList(jobId, conf);
testChangingJobPriority(jobId, conf);
Modified: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapreduce/TestNoJobSetupCleanup.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapreduce/TestNoJobSetupCleanup.java?rev=949933&r1=949932&r2=949933&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapreduce/TestNoJobSetupCleanup.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapreduce/TestNoJobSetupCleanup.java Tue Jun 1 05:24:36 2010
@@ -27,8 +27,6 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.PathFilter;
import org.apache.hadoop.fs.FileAlreadyExistsException;
import org.apache.hadoop.mapred.HadoopTestCase;
-import org.apache.hadoop.mapred.JobClient;
-import org.apache.hadoop.mapred.JobID;
import org.apache.hadoop.mapreduce.lib.output.TextOutputFormat;
import org.apache.hadoop.mapreduce.task.TaskAttemptContextImpl;
@@ -51,12 +49,10 @@ public class TestNoJobSetupCleanup exten
job.setOutputFormatClass(MyOutputFormat.class);
job.waitForCompletion(true);
assertTrue(job.isSuccessful());
- JobID jobid = (org.apache.hadoop.mapred.JobID)job.getID();
- JobClient jc = new JobClient(conf);
- assertTrue(jc.getSetupTaskReports(jobid).length == 0);
- assertTrue(jc.getCleanupTaskReports(jobid).length == 0);
- assertTrue(jc.getMapTaskReports(jobid).length == numMaps);
- assertTrue(jc.getReduceTaskReports(jobid).length == numReds);
+ assertTrue(job.getTaskReports(TaskType.JOB_SETUP).length == 0);
+ assertTrue(job.getTaskReports(TaskType.JOB_CLEANUP).length == 0);
+ assertTrue(job.getTaskReports(TaskType.MAP).length == numMaps);
+ assertTrue(job.getTaskReports(TaskType.REDUCE).length == numReds);
FileSystem fs = FileSystem.get(conf);
assertTrue("Job output directory doesn't exit!", fs.exists(outDir));
FileStatus[] list = fs.listStatus(outDir, new OutputFilter());
Modified: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapreduce/lib/output/TestJobOutputCommitter.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapreduce/lib/output/TestJobOutputCommitter.java?rev=949933&r1=949932&r2=949933&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapreduce/lib/output/TestJobOutputCommitter.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapreduce/lib/output/TestJobOutputCommitter.java Tue Jun 1 05:24:36 2010
@@ -149,13 +149,13 @@ public class TestJobOutputCommitter exte
assertTrue("Job failed!", job.waitForCompletion(true));
Path testFile = new Path(outDir, filename);
- assertTrue("Done file missing for job " + job.getID(), fs.exists(testFile));
+ assertTrue("Done file missing for job " + job.getJobID(), fs.exists(testFile));
// check if the files from the missing set exists
for (String ex : exclude) {
Path file = new Path(outDir, ex);
assertFalse("File " + file + " should not be present for successful job "
- + job.getID(), fs.exists(file));
+ + job.getJobID(), fs.exists(file));
}
}
@@ -170,7 +170,7 @@ public class TestJobOutputCommitter exte
if (fileName != null) {
Path testFile = new Path(outDir, fileName);
- assertTrue("File " + testFile + " missing for failed job " + job.getID(),
+ assertTrue("File " + testFile + " missing for failed job " + job.getJobID(),
fs.exists(testFile));
}
@@ -178,7 +178,7 @@ public class TestJobOutputCommitter exte
for (String ex : exclude) {
Path file = new Path(outDir, ex);
assertFalse("File " + file + " should not be present for failed job "
- + job.getID(), fs.exists(file));
+ + job.getJobID(), fs.exists(file));
}
}
@@ -202,7 +202,7 @@ public class TestJobOutputCommitter exte
if (fileName != null) {
Path testFile = new Path(outDir, fileName);
- assertTrue("File " + testFile + " missing for job " + job.getID(), fs
+ assertTrue("File " + testFile + " missing for job " + job.getJobID(), fs
.exists(testFile));
}
@@ -210,7 +210,7 @@ public class TestJobOutputCommitter exte
for (String ex : exclude) {
Path file = new Path(outDir, ex);
assertFalse("File " + file + " should not be present for killed job "
- + job.getID(), fs.exists(file));
+ + job.getJobID(), fs.exists(file));
}
}