YARN-11504. [Addendum] [Federation] YARN Federation Supports Non-HA mode. (#5746)

Author: yl09099

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RMProxy.java

@@ -130,8 +130,11 @@ protected static <T> T createRMProxy(final Configuration configuration,
  protected static <T> T createRMProxyFederation(final Configuration configuration,
  final Class<T> protocol, RMProxy<T> instance) throws IOException {
  YarnConfiguration yarnConf = new YarnConfiguration(configuration);
- RetryPolicy retryPolicy = createRetryPolicy(yarnConf, isFailoverEnabled(yarnConf));
- return newProxyInstanceFederation(yarnConf, protocol, instance, retryPolicy);
+ if (isFederationNonHAEnabled(yarnConf)) {
+ RetryPolicy retryPolicy = createRetryPolicy(yarnConf, isFailoverEnabled(yarnConf));
+ return newProxyInstanceFederation(yarnConf, protocol, instance, retryPolicy);
+ }
+ return createRMProxy(configuration, protocol, instance);
  }
 
  protected static <T> T newProxyInstanceFederation(final YarnConfiguration conf,