YARN-8147. TestClientRMService#testGetApplications sporadically fails. Contributed by Jason Lowe

(cherry picked from commit 18844599ae)
This commit is contained in:
Eric E Payne 2018-04-12 17:53:57 +00:00
parent b0dfb18daa
commit 7393020cb3
1 changed files with 9 additions and 5 deletions

View File

@ -757,7 +757,7 @@ public class TestClientRMService {
} }
@Test @Test
public void testGetApplications() throws IOException, YarnException { public void testGetApplications() throws Exception {
/** /**
* 1. Submit 3 applications alternately in two queues * 1. Submit 3 applications alternately in two queues
* 2. Test each of the filters * 2. Test each of the filters
@ -806,8 +806,12 @@ public class TestClientRMService {
SubmitApplicationRequest submitRequest = mockSubmitAppRequest( SubmitApplicationRequest submitRequest = mockSubmitAppRequest(
appId, appNames[i], queues[i % queues.length], appId, appNames[i], queues[i % queues.length],
new HashSet<String>(tags.subList(0, i + 1))); new HashSet<String>(tags.subList(0, i + 1)));
// make sure each app is submitted at a different time
Thread.sleep(1);
rmService.submitApplication(submitRequest); rmService.submitApplication(submitRequest);
submitTimeMillis[i] = System.currentTimeMillis(); submitTimeMillis[i] = rmService.getApplicationReport(
GetApplicationReportRequest.newInstance(appId))
.getApplicationReport().getStartTime();
} }
// Test different cases of ClientRMService#getApplications() // Test different cases of ClientRMService#getApplications()
@ -822,19 +826,19 @@ public class TestClientRMService {
// Check start range // Check start range
request = GetApplicationsRequest.newInstance(); request = GetApplicationsRequest.newInstance();
request.setStartRange(submitTimeMillis[0], System.currentTimeMillis()); request.setStartRange(submitTimeMillis[0] + 1, System.currentTimeMillis());
// 2 applications are submitted after first timeMills // 2 applications are submitted after first timeMills
assertEquals("Incorrect number of matching start range", assertEquals("Incorrect number of matching start range",
2, rmService.getApplications(request).getApplicationList().size()); 2, rmService.getApplications(request).getApplicationList().size());
// 1 application is submitted after the second timeMills // 1 application is submitted after the second timeMills
request.setStartRange(submitTimeMillis[1], System.currentTimeMillis()); request.setStartRange(submitTimeMillis[1] + 1, System.currentTimeMillis());
assertEquals("Incorrect number of matching start range", assertEquals("Incorrect number of matching start range",
1, rmService.getApplications(request).getApplicationList().size()); 1, rmService.getApplications(request).getApplicationList().size());
// no application is submitted after the third timeMills // no application is submitted after the third timeMills
request.setStartRange(submitTimeMillis[2], System.currentTimeMillis()); request.setStartRange(submitTimeMillis[2] + 1, System.currentTimeMillis());
assertEquals("Incorrect number of matching start range", assertEquals("Incorrect number of matching start range",
0, rmService.getApplications(request).getApplicationList().size()); 0, rmService.getApplications(request).getApplicationList().size());