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

YARN-8815. RM fails to recover finished unmanaged AM. Contributed by Bibin A Chundatt. 

(cherry picked from commit 50bc7746d7)
This commit is contained in:
Rohith Sharma K S 2018-09-25 11:31:14 +05:30
parent daa14bf06a
commit 47306cc2db
3 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStore.java
View File

@ -305,6 +305,7 @@ public abstract class RMStateStore extends AbstractService {
context.setPriority(srcCtx.getPriority()); context.setPriority(srcCtx.getPriority());
context.setApplicationTags(srcCtx.getApplicationTags()); context.setApplicationTags(srcCtx.getApplicationTags());
context.setApplicationType(srcCtx.getApplicationType()); context.setApplicationType(srcCtx.getApplicationType());
context.setUnmanagedAM(srcCtx.getUnmanagedAM());
ContainerLaunchContextPBImpl amContainerSpec = ContainerLaunchContextPBImpl amContainerSpec =
new ContainerLaunchContextPBImpl(); new ContainerLaunchContextPBImpl();
amContainerSpec.setApplicationACLs( amContainerSpec.setApplicationACLs(

9
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

@ -586,6 +586,15 @@ public class MockRM extends ResourceManager {
true, false, false, null, 0, null, true, null); true, false, false, null, 0, null, true, null);
} }
public RMApp submitApp(Resource resource, String name, String user,
Map<ApplicationAccessType, String> acls, boolean unManaged, String queue)
throws Exception {
return submitApp(resource, name, user, acls, unManaged, queue,
super.getConfig().getInt(YarnConfiguration.RM_AM_MAX_ATTEMPTS,
YarnConfiguration.DEFAULT_RM_AM_MAX_ATTEMPTS), null, null, true,
false, false, null, 0, null, true, null);
}
public RMApp submitApp(int masterMemory, String name, String user, public RMApp submitApp(int masterMemory, String name, String user,
Map<ApplicationAccessType, String> acls, String queue, Map<ApplicationAccessType, String> acls, String queue,
boolean waitForAccepted) throws Exception { boolean waitForAccepted) throws Exception {

19
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMRestart.java
View File

@ -456,6 +456,25 @@ public class TestRMRestart extends ParameterizedSchedulerTestBase {
Assert.assertEquals(4, rmAppState.size()); Assert.assertEquals(4, rmAppState.size());
} }
@Test(timeout = 60000)
public void testUnManagedRMRestart() throws Exception {
// Create RM
MockRM rm1 = createMockRM(conf);
MemoryRMStateStore memStore = (MemoryRMStateStore) rm1.getRMStateStore();
rm1.start();
// create app and launch the AM
RMApp app0 =
rm1.submitApp(null, "name", "user", new HashMap<>(), true, "default");
rm1.killApp(app0.getApplicationId());
rm1.waitForState(app0.getApplicationId(), RMAppState.KILLED);
// start new RM
MockRM rm2 = createMockRM(conf, memStore);
rm2.start();
Assert.assertEquals(1, rm2.getRMContext().getRMApps().size());
rm1.stop();
rm2.stop();
}
@Test (timeout = 60000) @Test (timeout = 60000)
public void testRMRestartAppRunningAMFailed() throws Exception { public void testRMRestartAppRunningAMFailed() throws Exception {
conf.setInt(YarnConfiguration.RM_AM_MAX_ATTEMPTS, conf.setInt(YarnConfiguration.RM_AM_MAX_ATTEMPTS,