YARN-6827. [ATS1/1.5] NPE exception while publishing recovering applications into ATS during RM restart. Contributed by Rohith Sharma K S.
(cherry picked from commit 7d06806dfd
)
This commit is contained in:
parent
a3c1735951
commit
733248cec7
|
@ -1227,8 +1227,6 @@ public class ResourceManager extends CompositeService implements Recoverable {
|
|||
protected void serviceStart() throws Exception {
|
||||
if (this.rmContext.isHAEnabled()) {
|
||||
transitionToStandby(false);
|
||||
} else {
|
||||
transitionToActive();
|
||||
}
|
||||
|
||||
startWepApp();
|
||||
|
@ -1238,6 +1236,11 @@ public class ResourceManager extends CompositeService implements Recoverable {
|
|||
WebAppUtils.setRMWebAppPort(conf, port);
|
||||
}
|
||||
super.serviceStart();
|
||||
|
||||
// Non HA case, start after RM services are started.
|
||||
if (!this.rmContext.isHAEnabled()) {
|
||||
transitionToActive();
|
||||
}
|
||||
}
|
||||
|
||||
protected void doSecureLogin() throws IOException {
|
||||
|
|
Loading…
Reference in New Issue