YARN-2340. Fixed NPE when queue is stopped during RM restart. Contributed by Rohith Sharmaks
(cherry picked from commit 0d89859b51
)
This commit is contained in:
parent
411836b74c
commit
8b398a66ca
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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();
|
||||
|
|
Loading…
Reference in New Issue