Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAPREDUCE-6110. JobHistoryServer CLI throws NullPointerException with job ids that do not exist. (Kai Sasaki via gtcarrera9) 

(cherry picked from commit 57ead18a85)
This commit is contained in:
Li Lu 2016-03-22 14:27:32 -07:00
parent 4dd02f9484
commit 8bbb5efbfb
2 changed files with 68 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/tools/CLI.java
View File

@ -402,8 +402,13 @@ public int run(String[] argv) throws Exception {
} }
} }
} else if (listEvents) { } else if (listEvents) {
listEvents(getJob(JobID.forName(jobid)), fromEvent, nEvents); Job job = getJob(JobID.forName(jobid));
exitCode = 0; if (job == null) {
System.out.println("Could not find job " + jobid);
} else {
listEvents(job, fromEvent, nEvents);
exitCode = 0;
}
} else if (listJobs) { } else if (listJobs) {
listJobs(cluster); listJobs(cluster);
exitCode = 0; exitCode = 0;
@ -417,8 +422,13 @@ public int run(String[] argv) throws Exception {
listBlacklistedTrackers(cluster); listBlacklistedTrackers(cluster);
exitCode = 0; exitCode = 0;
} else if (displayTasks) { } else if (displayTasks) {
displayTasks(getJob(JobID.forName(jobid)), taskType, taskState); Job job = getJob(JobID.forName(jobid));
exitCode = 0; if (job == null) {
System.out.println("Could not find job " + jobid);
} else {
displayTasks(getJob(JobID.forName(jobid)), taskType, taskState);
exitCode = 0;
}
} else if(killTask) { } else if(killTask) {
TaskAttemptID taskID = TaskAttemptID.forName(taskid); TaskAttemptID taskID = TaskAttemptID.forName(taskid);
Job job = getJob(taskID.getJobID()); Job job = getJob(taskID.getJobID());
@ -444,20 +454,24 @@ public int run(String[] argv) throws Exception {
exitCode = -1; exitCode = -1;
} }
} else if (logs) { } else if (logs) {
try {
JobID jobID = JobID.forName(jobid); JobID jobID = JobID.forName(jobid);
TaskAttemptID taskAttemptID = TaskAttemptID.forName(taskid); if (getJob(jobID) == null) {
LogParams logParams = cluster.getLogParams(jobID, taskAttemptID); System.out.println("Could not find job " + jobid);
LogCLIHelpers logDumper = new LogCLIHelpers(); } else {
logDumper.setConf(getConf()); try {
exitCode = logDumper.dumpAContainersLogs(logParams.getApplicationId(), TaskAttemptID taskAttemptID = TaskAttemptID.forName(taskid);
logParams.getContainerId(), logParams.getNodeId(), LogParams logParams = cluster.getLogParams(jobID, taskAttemptID);
logParams.getOwner()); LogCLIHelpers logDumper = new LogCLIHelpers();
} catch (IOException e) { logDumper.setConf(getConf());
if (e instanceof RemoteException) { exitCode = logDumper.dumpAContainersLogs(
throw e; logParams.getApplicationId(), logParams.getContainerId(),
} logParams.getNodeId(), logParams.getOwner());
System.out.println(e.getMessage()); } catch (IOException e) {
if (e instanceof RemoteException) {
throw e;
}
System.out.println(e.getMessage());
}
} }
} }
} catch (RemoteException re) { } catch (RemoteException re) {

38
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/tools/TestCLI.java
View File

@ -87,7 +87,7 @@ public void testListAttemptIdsWithInvalidInputs() throws Exception {
JobID jobId = JobID.forName(jobIdStr); JobID jobId = JobID.forName(jobIdStr);
Cluster mockCluster = mock(Cluster.class); Cluster mockCluster = mock(Cluster.class);
Job job = mock(Job.class); Job job = mock(Job.class);
CLI cli = spy(new CLI()); CLI cli = spy(new CLI(new Configuration()));
doReturn(mockCluster).when(cli).createCluster(); doReturn(mockCluster).when(cli).createCluster();
when(mockCluster.getJob(jobId)).thenReturn(job); when(mockCluster.getJob(jobId)).thenReturn(job);
@ -101,12 +101,18 @@ public void testListAttemptIdsWithInvalidInputs() throws Exception {
int retCode_invalidTaskState = cli.run(new String[] { "-list-attempt-ids", int retCode_invalidTaskState = cli.run(new String[] { "-list-attempt-ids",
jobIdStr, "REDUCE", "complete" }); jobIdStr, "REDUCE", "complete" });
String jobIdStr2 = "job_1015298225799_0016";
int retCode_invalidJobId = cli.run(new String[] { "-list-attempt-ids",
jobIdStr2, "MAP", "running" });
assertEquals("JOB_SETUP is an invalid input,exit code should be -1", -1, assertEquals("JOB_SETUP is an invalid input,exit code should be -1", -1,
retCode_JOB_SETUP); retCode_JOB_SETUP);
assertEquals("JOB_CLEANUP is an invalid input,exit code should be -1", -1, assertEquals("JOB_CLEANUP is an invalid input,exit code should be -1", -1,
retCode_JOB_CLEANUP); retCode_JOB_CLEANUP);
assertEquals("complete is an invalid input,exit code should be -1", -1, assertEquals("complete is an invalid input,exit code should be -1", -1,
retCode_invalidTaskState); retCode_invalidTaskState);
assertEquals("Non existing job id should be skippted with -1", -1,
retCode_invalidJobId);
} }
@ -176,4 +182,34 @@ public void testGetJob() throws Exception {
Assert.assertTrue(end - start < ((i + 1) * sleepTime)); Assert.assertTrue(end - start < ((i + 1) * sleepTime));
} }
} }
@Test
public void testListEvents() throws Exception {
Cluster mockCluster = mock(Cluster.class);
CLI cli = spy(new CLI(new Configuration()));
doReturn(mockCluster).when(cli).createCluster();
String jobId1 = "job_1234654654_001";
String jobId2 = "job_1234654656_002";
Job mockJob1 = mockJob(mockCluster, jobId1, State.RUNNING);
// Check exiting with non existing job
int exitCode = cli.run(new String[]{"-events", jobId2, "0", "10"});
assertEquals(-1, exitCode);
}
@Test
public void testLogs() throws Exception {
Cluster mockCluster = mock(Cluster.class);
CLI cli = spy(new CLI(new Configuration()));
doReturn(mockCluster).when(cli).createCluster();
String jobId1 = "job_1234654654_001";
String jobId2 = "job_1234654656_002";
Job mockJob1 = mockJob(mockCluster, jobId1, State.SUCCEEDED);
// Check exiting with non existing job
int exitCode = cli.run(new String[]{"-logs", jobId2});
assertEquals(-1, exitCode);
}
} }