diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java index 4051054..e0840b6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java @@ -194,22 +194,6 @@ protected void serviceInit(Configuration conf) throws Exception { this.conf = conf; this.rmContext = new RMContextImpl(); - // Set HA configuration should be done before login - this.rmContext.setHAEnabled(HAUtil.isHAEnabled(this.conf)); - if (this.rmContext.isHAEnabled()) { - HAUtil.verifyAndSetConfiguration(this.conf); - } - - // Set UGI and do login - // If security is enabled, use login user - // If security is not enabled, use current user - this.rmLoginUGI = UserGroupInformation.getCurrentUser(); - try { - doSecureLogin(); - } catch(IOException ie) { - throw new YarnRuntimeException("Failed to login", ie); - } - this.configurationProvider = ConfigurationProviderFactory.getConfigurationProvider(conf); this.configurationProvider.init(this.conf); @@ -242,6 +226,22 @@ protected void serviceInit(Configuration conf) throws Exception { } validateConfigs(this.conf); + + // Set HA configuration should be done before login + this.rmContext.setHAEnabled(HAUtil.isHAEnabled(this.conf)); + if (this.rmContext.isHAEnabled()) { + HAUtil.verifyAndSetConfiguration(this.conf); + } + + // Set UGI and do login + // If security is enabled, use login user + // If security is not enabled, use current user + this.rmLoginUGI = UserGroupInformation.getCurrentUser(); + try { + doSecureLogin(); + } catch(IOException ie) { + throw new YarnRuntimeException("Failed to login", ie); + } // register the handlers for all AlwaysOn services using setupDispatcher(). rmDispatcher = setupDispatcher();