Repository: hadoop Updated Branches: refs/heads/branch-2 81da7d1d3 -> ba5d48236
YARN-6009. Skip validating app timeout value on recovery. Contributed by Rohith Sharma K S (cherry picked from commit 020316458dfe6059b700f8d93a9791e4cb817b3f) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ba5d4823 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ba5d4823 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ba5d4823 Branch: refs/heads/branch-2 Commit: ba5d482366fad3e2187cc4c0f806e2af864fef40 Parents: 81da7d1 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:27:36 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/ba5d4823/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 d18a5f6..a808445 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 @@ -340,13 +340,16 @@ public class RMAppManager implements EventHandler<RMAppManagerEvent>, private RMAppImpl createAndPopulateNewRMApp( ApplicationSubmissionContext submissionContext, long submitTime, String user, boolean isRecovery) 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(); @@ -388,10 +391,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, submissionContext.getApplicationName(), user, --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
