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

YARN-5317. testAMRestartNotLostContainerCompleteMsg may fail. Contributed by sandflee 

(cherry picked from commit 10b704c594)
This commit is contained in:
Jason Lowe 2016-07-12 20:27:41 +00:00
parent 9d08ca1ed7
commit 0a94c6d9da
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java
View File

@ -683,7 +683,12 @@ public class MockRM extends ResourceManager {
return client.failApplicationAttempt(req); return client.failApplicationAttempt(req);
} }
// from AMLauncher /**
* recommend to use launchAM, or use sendAMLaunched like:
* 1, wait RMAppAttempt scheduled
* 2, send node heartbeat
* 3, sendAMLaunched
*/
public MockAM sendAMLaunched(ApplicationAttemptId appAttemptId) public MockAM sendAMLaunched(ApplicationAttemptId appAttemptId)
throws Exception { throws Exception {
MockAM am = new MockAM(getRMContext(), masterService, appAttemptId); MockAM am = new MockAM(getRMContext(), masterService, appAttemptId);

10
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestAMRestart.java
View File

@ -158,12 +158,11 @@ public class TestAMRestart {
Assert.assertFalse(newAttemptId.equals(am1.getApplicationAttemptId())); Assert.assertFalse(newAttemptId.equals(am1.getApplicationAttemptId()));
// launch the new AM // launch the new AM
RMAppAttempt attempt2 = app1.getCurrentAppAttempt(); MockAM am2 = rm1.launchAM(app1, rm1, nm1);
nm1.nodeHeartbeat(true);
MockAM am2 = rm1.sendAMLaunched(attempt2.getAppAttemptId());
RegisterApplicationMasterResponse registerResponse = RegisterApplicationMasterResponse registerResponse =
am2.registerAppAttempt(); am2.registerAppAttempt();
// Assert two containers are running: container2 and container3; // Assert two containers are running: container2 and container3;
Assert.assertEquals(2, registerResponse.getContainersFromPreviousAttempts() Assert.assertEquals(2, registerResponse.getContainersFromPreviousAttempts()
.size()); .size());
@ -976,10 +975,7 @@ public class TestAMRestart {
// launch the new AM // launch the new AM
RMAppAttempt attempt2 = app1.getCurrentAppAttempt(); RMAppAttempt attempt2 = app1.getCurrentAppAttempt();
nm1.nodeHeartbeat(true); MockAM am2 = rm1.launchAndRegisterAM(app1, rm1, nm1);
MockAM am2 = rm1.sendAMLaunched(attempt2.getAppAttemptId());
am2.registerAppAttempt();
rm1.waitForState(app1.getApplicationId(), RMAppState.RUNNING);
// whether new AM could get container complete msg // whether new AM could get container complete msg
AllocateResponse allocateResponse = am2.allocate( AllocateResponse allocateResponse = am2.allocate(