YARN-6009. Skip validating app timeout value on recovery. Contributed by Rohith Sharma K S
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/02031645 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/02031645 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/02031645 Branch: refs/heads/HADOOP-13345 Commit: 020316458dfe6059b700f8d93a9791e4cb817b3f Parents: 71a4acf Author: Jian He <jia...@apache.org> Authored: Fri Jan 6 18:19:09 2017 -0800 Committer: Jian He <jia...@apache.org> Committed: Fri Jan 6 18:19:09 2017 -0800 ---------------------------------------------------------------------- .../hadoop/yarn/server/resourcemanager/RMAppManager.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/02031645/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java index bc21952..9dd544e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java @@ -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, --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
