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

YARN-9820. RM logs InvalidStateTransitionException when app is submitted. Contributed by Prabhu Joseph

This commit is contained in:
Jonathan Hung 2019-09-09 00:23:04 -07:00
parent 080fc6d943
commit 0e88bcd8e6
4 changed files with 20 additions and 3 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/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStore.java
View File

@ -852,6 +852,13 @@ public abstract class RMStateStore extends AbstractService {
getRMStateStoreEventHandler().handle(new RMStateUpdateAppEvent(appState)); getRMStateStoreEventHandler().handle(new RMStateUpdateAppEvent(appState));
} }
@SuppressWarnings("unchecked")
public void updateApplicationState(ApplicationStateData appState,
boolean notifyApp) {
getRMStateStoreEventHandler().handle(new RMStateUpdateAppEvent(appState,
notifyApp));
}
public void updateApplicationStateSynchronously(ApplicationStateData appState, public void updateApplicationStateSynchronously(ApplicationStateData appState,
boolean notifyApp, SettableFuture<Object> resultFuture) { boolean notifyApp, SettableFuture<Object> resultFuture) {
handleStoreEvent( handleStoreEvent(

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

@ -30,9 +30,14 @@ public class RMStateUpdateAppEvent extends RMStateStoreEvent {
private SettableFuture<Object> future; private SettableFuture<Object> future;
public RMStateUpdateAppEvent(ApplicationStateData appState) { public RMStateUpdateAppEvent(ApplicationStateData appState) {
this (appState, true);
}
public RMStateUpdateAppEvent(ApplicationStateData appState,
boolean notifyApplication) {
super(RMStateStoreEventType.UPDATE_APP); super(RMStateStoreEventType.UPDATE_APP);
this.appState = appState; this.appState = appState;
this.notifyApplication = true; this.notifyApplication = notifyApplication;
this.future = null; this.future = null;
} }

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java
View File

@ -1036,7 +1036,7 @@ public class RMAppImpl implements RMApp, Recoverable {
app.callerContext); app.callerContext);
appState.setApplicationTimeouts(app.getApplicationTimeouts()); appState.setApplicationTimeouts(app.getApplicationTimeouts());
appState.setLaunchTime(event.getTimestamp()); appState.setLaunchTime(event.getTimestamp());
app.rmContext.getStateStore().updateApplicationState(appState); app.rmContext.getStateStore().updateApplicationState(appState, false);
app.launchTime = event.getTimestamp(); app.launchTime = event.getTimestamp();
} }
} }

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

@ -19,6 +19,7 @@
package org.apache.hadoop.yarn.server.resourcemanager.rmapp; package org.apache.hadoop.yarn.server.resourcemanager.rmapp;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.mockito.Matchers.any; import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyLong; import static org.mockito.Matchers.anyLong;
import static org.mockito.Matchers.eq; import static org.mockito.Matchers.eq;
@ -472,8 +473,12 @@ public class TestRMAppTransitions {
private void assertAppStateLaunchTimeSaved(long expectedLaunchTime) { private void assertAppStateLaunchTimeSaved(long expectedLaunchTime) {
ArgumentCaptor<ApplicationStateData> state = ArgumentCaptor<ApplicationStateData> state =
ArgumentCaptor.forClass(ApplicationStateData.class); ArgumentCaptor.forClass(ApplicationStateData.class);
verify(store, times(1)).updateApplicationState(state.capture()); ArgumentCaptor<Boolean> notifyApp =
ArgumentCaptor.forClass(Boolean.class);
verify(store, times(1)).updateApplicationState(state.capture(),
notifyApp.capture());
assertEquals(expectedLaunchTime, state.getValue().getLaunchTime()); assertEquals(expectedLaunchTime, state.getValue().getLaunchTime());
assertFalse(notifyApp.getValue());
} }
private void assertKilled(RMApp application) { private void assertKilled(RMApp application) {