Repository: hadoop Updated Branches: refs/heads/branch-2 411836b74 -> 8b398a66c
YARN-2340. Fixed NPE when queue is stopped during RM restart. Contributed by Rohith Sharmaks (cherry picked from commit 0d89859b51157078cc504ac81dc8aa75ce6b1782) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8b398a66 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8b398a66 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8b398a66 Branch: refs/heads/branch-2 Commit: 8b398a66ca3728f47363fc8b2fcf7e556e6bbf5a Parents: 411836b Author: Jian He <jia...@apache.org> Authored: Mon Dec 22 21:53:22 2014 -0800 Committer: Jian He <jia...@apache.org> Committed: Mon Dec 22 21:55:06 2014 -0800 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../scheduler/capacity/CapacityScheduler.java | 13 ++++++++----- .../resourcemanager/TestWorkPreservingRMRestart.java | 2 ++ 3 files changed, 13 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/8b398a66/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 4bcc1c5..3ed97af 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -234,6 +234,9 @@ Release 2.7.0 - UNRELEASED YARN-2920. Changed CapacityScheduler to kill containers on nodes where node labels are changed. (Wangda Tan via jianhe) + YARN-2340. Fixed NPE when queue is stopped during RM restart. + (Rohith Sharmaks via jianhe) + Release 2.6.0 - 2014-11-18 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/8b398a66/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.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/scheduler/capacity/CapacityScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java index e865a65..3648c54 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java @@ -706,11 +706,14 @@ public class CapacityScheduler extends try { queue.submitApplication(applicationId, user, queueName); } catch (AccessControlException ace) { - LOG.info("Failed to submit application " + applicationId + " to queue " - + queueName + " from user " + user, ace); - this.rmContext.getDispatcher().getEventHandler() - .handle(new RMAppRejectedEvent(applicationId, ace.toString())); - return; + // Ignore the exception for recovered app as the app was previously accepted + if (!isAppRecovering) { + LOG.info("Failed to submit application " + applicationId + " to queue " + + queueName + " from user " + user, ace); + this.rmContext.getDispatcher().getEventHandler() + .handle(new RMAppRejectedEvent(applicationId, ace.toString())); + return; + } } // update the metrics queue.getMetrics().submitApp(user); http://git-wip-us.apache.org/repos/asf/hadoop/blob/8b398a66/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestWorkPreservingRMRestart.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestWorkPreservingRMRestart.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestWorkPreservingRMRestart.java index 853e0a5..842eaec 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestWorkPreservingRMRestart.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestWorkPreservingRMRestart.java @@ -500,6 +500,8 @@ public class TestWorkPreservingRMRestart { rm1.clearQueueMetrics(app1_2); rm1.clearQueueMetrics(app2); + csConf.set("yarn.scheduler.capacity.root.Default.QueueB.state", "STOPPED"); + // Re-start RM rm2 = new MockRM(csConf, memStore); rm2.start();
