big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MAPREDUCE-6762. ControlledJob#toString failed with NPE when job status is not successfully updated (Weiwei Yang via Varun Saxena)

Browse Source
This commit is contained in:
Varun Saxena 2016-08-21 21:46:17 +05:30
parent 0faee62a0c
commit d37b45d613
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/Job.java
View File

@ -422,7 +422,7 @@ public JobPriority getPriority() throws IOException, InterruptedException {
* The user-specified job name.
*/
public String getJobName() {
if (state == JobState.DEFINE) {
if (state == JobState.DEFINE || status == null) {
return super.getJobName();
}
ensureState(JobState.RUNNING);

36
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/TestJob.java
View File

@ -26,6 +26,7 @@
import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapreduce.JobStatus.State;
import org.apache.hadoop.mapreduce.lib.jobcontrol.ControlledJob;
import org.apache.hadoop.mapreduce.protocol.ClientProtocol;
import org.apache.hadoop.security.Credentials;
import org.apache.hadoop.security.UserGroupInformation;
@ -54,6 +55,41 @@ public void testJobToString() throws IOException, InterruptedException {
Assert.assertNotNull(job.toString());
}
@Test
public void testUnexpectedJobStatus() throws Exception {
Cluster cluster = mock(Cluster.class);
JobID jobid = new JobID("1014873536921", 6);
ClientProtocol clientProtocol = mock(ClientProtocol.class);
when(cluster.getClient()).thenReturn(clientProtocol);
JobStatus status = new JobStatus(jobid, 0f, 0f, 0f, 0f,
State.RUNNING, JobPriority.DEFAULT, "root",
"testUnexpectedJobStatus", "job file", "tracking URL");
when(clientProtocol.getJobStatus(jobid)).thenReturn(status);
Job job = Job.getInstance(cluster, status, new JobConf());
// ensurer job status is RUNNING
Assert.assertNotNull(job.getStatus());
Assert.assertTrue(job.getStatus().getState() == State.RUNNING);
// when updating job status, job client could not retrieve
// job status, and status reset to null
when(clientProtocol.getJobStatus(jobid)).thenReturn(null);
try {
job.updateStatus();
} catch (IOException e) {
Assert.assertTrue(e != null
&& e.getMessage().contains("Job status not available"));
}
try {
ControlledJob cj = new ControlledJob(job, null);
Assert.assertNotNull(cj.toString());
} catch (NullPointerException e) {
Assert.fail("job API fails with NPE");
}
}
@Test
public void testUGICredentialsPropogation() throws Exception {
Credentials creds = new Credentials();