|
@@ -342,13 +342,16 @@ public class RMAppManager implements EventHandler<RMAppManagerEvent>,
|
|
|
private RMAppImpl createAndPopulateNewRMApp(
|
|
|
ApplicationSubmissionContext submissionContext, long submitTime,
|
|
|
String user, boolean isRecovery, long startTime) throws YarnException {
|
|
|
- // Do queue mapping
|
|
|
if (!isRecovery) {
|
|
|
+ // Do queue mapping
|
|
|
if (rmContext.getQueuePlacementManager() != null) {
|
|
|
// We only do queue mapping when it's a new application
|
|
|
rmContext.getQueuePlacementManager().placeApplication(
|
|
|
submissionContext, user);
|
|
|
}
|
|
|
+ // fail the submission if configured application timeout value is invalid
|
|
|
+ RMServerUtils.validateApplicationTimeouts(
|
|
|
+ submissionContext.getApplicationTimeouts());
|
|
|
}
|
|
|
|
|
|
ApplicationId applicationId = submissionContext.getApplicationId();
|
|
@@ -390,10 +393,6 @@ public class RMAppManager implements EventHandler<RMAppManagerEvent>,
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- // fail the submission if configured application timeout value is invalid
|
|
|
- RMServerUtils.validateApplicationTimeouts(
|
|
|
- submissionContext.getApplicationTimeouts());
|
|
|
-
|
|
|
// Create RMApp
|
|
|
RMAppImpl application =
|
|
|
new RMAppImpl(applicationId, rmContext, this.conf,
|