MAPREDUCE-6625. TestCLI#testGetJob fails occasionally (haibochen via rkanter)
(cherry picked from commit ad256beb50
)
This commit is contained in:
parent
35108025e7
commit
ba83b62d36
|
@ -31,9 +31,10 @@ import org.apache.hadoop.mapreduce.TaskType;
|
|||
import org.apache.hadoop.mapreduce.JobPriority;
|
||||
import org.apache.hadoop.mapreduce.JobStatus;
|
||||
import org.apache.hadoop.mapreduce.JobStatus.State;
|
||||
import org.apache.hadoop.util.Time;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
|
||||
import static org.mockito.Matchers.any;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.when;
|
||||
import static org.mockito.Mockito.times;
|
||||
|
@ -156,24 +157,32 @@ public class TestCLI {
|
|||
}
|
||||
|
||||
@Test
|
||||
public void testGetJob() throws Exception {
|
||||
public void testGetJobWithoutRetry() throws Exception {
|
||||
Configuration conf = new Configuration();
|
||||
long sleepTime = 100;
|
||||
conf.setLong(MRJobConfig.MR_CLIENT_JOB_RETRY_INTERVAL, sleepTime);
|
||||
Cluster mockCluster = mock(Cluster.class);
|
||||
JobID jobId1 = JobID.forName("job_1234654654_001");
|
||||
when(mockCluster.getJob(jobId1)).thenReturn(null);
|
||||
conf.setInt(MRJobConfig.MR_CLIENT_JOB_MAX_RETRIES, 0);
|
||||
|
||||
for (int i = 0; i < 2; ++i) {
|
||||
conf.setInt(MRJobConfig.MR_CLIENT_JOB_MAX_RETRIES, i);
|
||||
CLI cli = spy(new CLI(conf));
|
||||
cli.cluster = mockCluster;
|
||||
doReturn(mockCluster).when(cli).createCluster();
|
||||
long start = Time.monotonicNow();
|
||||
cli.getJob(jobId1);
|
||||
long end = Time.monotonicNow();
|
||||
Assert.assertTrue(end - start > (i * sleepTime));
|
||||
Assert.assertTrue(end - start < ((i + 1) * sleepTime));
|
||||
}
|
||||
final Cluster mockCluster = mock(Cluster.class);
|
||||
when(mockCluster.getJob(any(JobID.class))).thenReturn(null);
|
||||
CLI cli = new CLI(conf);
|
||||
cli.cluster = mockCluster;
|
||||
|
||||
Job job = cli.getJob(JobID.forName("job_1234654654_001"));
|
||||
Assert.assertTrue("job is not null", job == null);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetJobWithRetry() throws Exception {
|
||||
Configuration conf = new Configuration();
|
||||
conf.setInt(MRJobConfig.MR_CLIENT_JOB_MAX_RETRIES, 1);
|
||||
|
||||
final Cluster mockCluster = mock(Cluster.class);
|
||||
final Job mockJob = Job.getInstance(conf);
|
||||
when(mockCluster.getJob(any(JobID.class))).thenReturn(
|
||||
null).thenReturn(mockJob);
|
||||
CLI cli = new CLI(conf);
|
||||
cli.cluster = mockCluster;
|
||||
|
||||
Job job = cli.getJob(JobID.forName("job_1234654654_001"));
|
||||
Assert.assertTrue("job is null", job != null);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue