YARN-11391 Fix Jenkins reported issue

Xin Gao · Xin Gao · commit e2140c7cd996 · 2022-12-07T21:23:14.000-08:00
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/HAUtil.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/HAUtil.java
@@ -267,7 +267,7 @@ public static Collection<String> getRMHAIds(Configuration conf) {
 
   /**
    * Instead of returning RM_HA_IDS in current configurations, it
-   * would return the originally preset one in case of DNS resolving
+   * would return the originally preset one in case of DNS resolving.
    * @param conf Configuration.
    * @return RM Ids from original xml file
    */
@@ -343,7 +343,8 @@ public static Map<String, InetSocketAddress> getResolvedRMIdPairs(
     // this function would only return value which is corresponded to YarnConfiguration.RM_ADDRESS
     Map<String, InetSocketAddress> ret = null;
     for (List<String> configKeys : addressesConfigKeysMap.values()) {
-      Map<String, InetSocketAddress> res = getResolvedIdPairs(conf, resolveNeeded, requireFQDN, getOriginalRMHAIds(conf),
+      Map<String, InetSocketAddress> res = getResolvedIdPairs(
+          conf, resolveNeeded, requireFQDN, getOriginalRMHAIds(conf),
           configKeys.get(0), YarnConfiguration.RM_HA_IDS, configKeys);
       if (configKeys.contains(YarnConfiguration.RM_ADDRESS)) {
         ret = res;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/ConfiguredRMFailoverProxyProvider.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/ConfiguredRMFailoverProxyProvider.java
@@ -21,7 +21,6 @@
 import java.io.Closeable;
 import java.io.IOException;
 import java.net.InetSocketAddress;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
@@ -677,6 +677,40 @@
     <value>org.apache.hadoop.net.DNSDomainNameResolver</value>
   </property>
 
+  <property>
+    <description>
+      Determines if the given resourcemanager address is a domain name which needs to
+      be resolved (using the resolver configured by yarn.resourcemanager.ha.resolver.impl).
+      This adds a transparency layer in the client so physical server address
+      can change without changing the client.
+    </description>
+    <name>yarn.resourcemanager.ha.resolve-needed</name>
+    <value>false</value>
+  </property>
+
+  <property>
+    <description>
+      The amount of milliseconds between DNS address re-resolving.
+      By default, this parameter is set to -1 which disabled the DNS auto-refresh functionality.
+      Enabling the auto-refresh would help long running sessions (including node managers) able to
+      find the replaced resource managers (e.g. during node replacement/migration) without downtime.
+    </description>
+    <name>yarn.resourcemanager.ha.refresh-period-ms</name>
+    <value>-1</value>
+  </property>
+
+  <property>
+    <description>
+      Determines whether the resolved result is fully qualified domain name instead
+      of pure IP address(es).
+      In secure environment, this has to be enabled since Kerberos is using fqdn
+      in machine's principal therefore accessing servers by IP won't be recognized
+      by the KDC.
+    </description>
+    <name>yarn.resourcemanager.ha.resolver.useFQDN</name>
+    <value>true</value>
+  </property>
+
   <property>
     <description>Enable automatic failover.
       By default, it is enabled only when HA is enabled</description>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/client/TestConfiguredRMFailoverProxyProvider.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/client/TestConfiguredRMFailoverProxyProvider.java
@@ -43,7 +43,6 @@
 import static org.mockito.Mockito.mock;
 
 public class TestConfiguredRMFailoverProxyProvider {
-  private Configuration conf;
   private final static List<String> HOST_LIST = Arrays.asList(
       "host01",
       "host02",
@@ -62,28 +61,16 @@ public class TestConfiguredRMFailoverProxyProvider {
   private final static String MULTI_A_RM_SCHEDULER_ADDRESS = "rmscheduler.com";
   private final static long REFRESH_TIME_INTERVAL = 1000; // unit ms
 
-  ConfiguredRMFailoverProxyProvider<ApplicationClientProtocol> proxyProvider;
-
-  @Before
-  public void testInit() {
-    conf = new Configuration();
-    conf.set(YarnConfiguration.RM_HA_IDS, "rm1,rm2");
-    RMProxy rm1Mock = mock(RMProxy.class);
-    doNothing().when(rm1Mock).checkAllowedProtocols(ApplicationClientProtocol.class);
-    proxyProvider = new ConfiguredRMFailoverProxyProvider<ApplicationClientProtocol>();
-    proxyProvider.init(conf, rm1Mock, ApplicationClientProtocol.class);
-  }
-
   public Configuration getDNSConfig() {
     Configuration dnsConf = new Configuration();
     dnsConf.set(YarnConfiguration.RESOLVE_RM_ADDRESS_KEY, MockDomainNameResolver.class.getName());
     dnsConf.set(YarnConfiguration.RM_HA_IDS, MULTI_A_RM_ID);
-    dnsConf.set(HAUtil.addSuffix(YarnConfiguration.RM_ADDRESS, MULTI_A_RM_ID), MULTI_A_RM_ADDRESS +
-        ":" + YarnConfiguration.DEFAULT_RM_PORT);
-    dnsConf.set(HAUtil.addSuffix(YarnConfiguration.RM_ADMIN_ADDRESS, MULTI_A_RM_ID), MULTI_A_RM_ADDRESS +
-        ":" + YarnConfiguration.DEFAULT_RM_ADMIN_PORT);
-    dnsConf.set(HAUtil.addSuffix(YarnConfiguration.RM_SCHEDULER_ADDRESS, MULTI_A_RM_ID), MULTI_A_RM_SCHEDULER_ADDRESS +
-        ":" + YarnConfiguration.DEFAULT_RM_SCHEDULER_PORT);
+    dnsConf.set(HAUtil.addSuffix(YarnConfiguration.RM_ADDRESS, MULTI_A_RM_ID),
+        MULTI_A_RM_ADDRESS + ":" + YarnConfiguration.DEFAULT_RM_PORT);
+    dnsConf.set(HAUtil.addSuffix(YarnConfiguration.RM_ADMIN_ADDRESS, MULTI_A_RM_ID),
+        MULTI_A_RM_ADDRESS + ":" + YarnConfiguration.DEFAULT_RM_ADMIN_PORT);
+    dnsConf.set(HAUtil.addSuffix(YarnConfiguration.RM_SCHEDULER_ADDRESS, MULTI_A_RM_ID),
+        MULTI_A_RM_SCHEDULER_ADDRESS + ":" + YarnConfiguration.DEFAULT_RM_SCHEDULER_PORT);
     dnsConf.setBoolean(YarnConfiguration.RESOLVE_RM_ADDRESS_NEEDED_KEY, true);
     dnsConf.setBoolean(YarnConfiguration.RESOLVE_RM_ADDRESS_TO_FQDN, true);
     return dnsConf;
@@ -121,39 +108,44 @@ private void overrideDNSMapping(int excludeIdx) throws UnknownHostException {
     ((MockDomainNameResolver)HAUtil.getDnr()).setPtrMap(ptrMap);
   }
 
-  @Test(expected = IllegalStateException.class)
-  public void testInitWithNoInstances() {
-    Configuration conf = new Configuration();;
+  @SuppressWarnings("unchecked") // mock generics
+  private void initProxyProvider(
+      Configuration conf,
+      ConfiguredRMFailoverProxyProvider<ApplicationClientProtocol> proxyProvider) {
     RMProxy rm1Mock = mock(RMProxy.class);
     doNothing().when(rm1Mock).checkAllowedProtocols(ApplicationClientProtocol.class);
-    ConfiguredRMFailoverProxyProvider<ApplicationClientProtocol> proxyProviderWithNoInstances = new ConfiguredRMFailoverProxyProvider<ApplicationClientProtocol>();
-    proxyProviderWithNoInstances.init(conf, rm1Mock, ApplicationClientProtocol.class);
+    proxyProvider.init(conf, rm1Mock, ApplicationClientProtocol.class);
+  }
+
+  @Test(expected = IllegalStateException.class)
+  public void testInitWithNoInstances() {
+    Configuration conf = new Configuration();
+    ConfiguredRMFailoverProxyProvider<ApplicationClientProtocol> proxyProviderWithNoInstances =
+        new ConfiguredRMFailoverProxyProvider<ApplicationClientProtocol>();
+    initProxyProvider(conf, proxyProviderWithNoInstances);
   }
 
   @Test
   public void testGetProxy() {
-    FailoverProxyProvider.ProxyInfo<ApplicationClientProtocol> proxy = proxyProvider.getProxy();
     Configuration conf = new Configuration();
     conf.set(YarnConfiguration.RM_HA_IDS, "rm1,rm2,rm3,rm4");
-    RMProxy rm1Mock = mock(RMProxy.class);
-    doNothing().when(rm1Mock).checkAllowedProtocols(ApplicationClientProtocol.class);
-    ConfiguredRMFailoverProxyProvider<ApplicationClientProtocol> proxyProviderWithNoInstances = new ConfiguredRMFailoverProxyProvider<ApplicationClientProtocol>();
-    proxyProviderWithNoInstances.init(conf, rm1Mock, ApplicationClientProtocol.class);
-    assertEquals(proxyProviderWithNoInstances.rmServiceIds[0], "rm1");
-    FailoverProxyProvider.ProxyInfo<ApplicationClientProtocol> current = proxyProviderWithNoInstances.getProxy();
+    ConfiguredRMFailoverProxyProvider<ApplicationClientProtocol> proxyProvider =
+        new ConfiguredRMFailoverProxyProvider<ApplicationClientProtocol>();
+    initProxyProvider(conf, proxyProvider);
+    assertEquals(proxyProvider.rmServiceIds[0], "rm1");
+    FailoverProxyProvider.ProxyInfo<ApplicationClientProtocol> current =
+        proxyProvider.getProxy();
     assertEquals(current.proxyInfo, "rm1");
   }
 
   @Test
   public void testInitWithMultiARecordRM() throws UnknownHostException {
     Configuration conf = getDNSConfig();
-    RMProxy rm1Mock = mock(RMProxy.class);
-    doNothing().when(rm1Mock).checkAllowedProtocols(ApplicationClientProtocol.class);
     ConfiguredRMFailoverProxyProvider<ApplicationClientProtocol> proxyProviderWithmultiA =
         new ConfiguredRMFailoverProxyProvider<ApplicationClientProtocol>();
     HAUtil.setDnrByConfiguration(conf);
     overrideDNSMapping(1);
-    proxyProviderWithmultiA.init(conf, rm1Mock, ApplicationClientProtocol.class);
+    initProxyProvider(conf, proxyProviderWithmultiA);
     assertEquals(HOST_LIST.size() - 1, proxyProviderWithmultiA.rmServiceIds.length);
     for (String rmId : proxyProviderWithmultiA.rmServiceIds) {
       assertTrue(rmId.startsWith("rm_resolved_"));
@@ -163,19 +155,19 @@ public void testInitWithMultiARecordRM() throws UnknownHostException {
   @Test
   public void testResolveDifferentMultiARecordRM() throws UnknownHostException {
     Configuration conf = getDNSConfig();
-    RMProxy rm1Mock = mock(RMProxy.class);
-    doNothing().when(rm1Mock).checkAllowedProtocols(ApplicationClientProtocol.class);
     ConfiguredRMFailoverProxyProvider<ApplicationClientProtocol> proxyProviderWithmultiA =
         new ConfiguredRMFailoverProxyProvider<ApplicationClientProtocol>();
     HAUtil.setDnrByConfiguration(conf);
     overrideDNSMapping(1);
-    proxyProviderWithmultiA.init(conf, rm1Mock, ApplicationClientProtocol.class);
+    initProxyProvider(conf, proxyProviderWithmultiA);
     List<String> rmAddresses = getRMAddresses(proxyProviderWithmultiA.conf,
         proxyProviderWithmultiA.rmServiceIds,
         YarnConfiguration.RM_ADDRESS);
-    List<String> rmAdminAddresses = getRMAddresses(proxyProviderWithmultiA.conf, proxyProviderWithmultiA.rmServiceIds,
+    List<String> rmAdminAddresses = getRMAddresses(proxyProviderWithmultiA.conf,
+        proxyProviderWithmultiA.rmServiceIds,
         YarnConfiguration.RM_ADMIN_ADDRESS);
-    List<String> rmSchedulerAddresses = getRMAddresses(proxyProviderWithmultiA.conf, proxyProviderWithmultiA.rmServiceIds,
+    List<String> rmSchedulerAddresses = getRMAddresses(proxyProviderWithmultiA.conf,
+        proxyProviderWithmultiA.rmServiceIds,
         YarnConfiguration.RM_SCHEDULER_ADDRESS);
     assertEquals(HOST_LIST.size() - 1, rmAddresses.size());
     assertEquals(HOST_LIST.size() - 1, rmAdminAddresses.size());
@@ -187,18 +179,17 @@ public void testResolveDifferentMultiARecordRM() throws UnknownHostException {
   public void testRefreshWithMultiARecordRM() throws UnknownHostException, InterruptedException {
     Configuration conf = getDNSConfig();
     conf.setLong(YarnConfiguration.RM_ID_REFRESH_INTERVAL, REFRESH_TIME_INTERVAL);
-    RMProxy rm1Mock = mock(RMProxy.class);
-    doNothing().when(rm1Mock).checkAllowedProtocols(ApplicationClientProtocol.class);
     ConfiguredRMFailoverProxyProvider<ApplicationClientProtocol> proxyProviderWithmultiA =
         new ConfiguredRMFailoverProxyProvider<ApplicationClientProtocol>();
     HAUtil.setDnrByConfiguration(conf);
     overrideDNSMapping(0);
-    proxyProviderWithmultiA.init(conf, rm1Mock, ApplicationClientProtocol.class);
+    initProxyProvider(conf, proxyProviderWithmultiA);
     InetSocketAddress oldActiveRMAddress =
         conf.getSocketAddr(HAUtil.addSuffix(YarnConfiguration.RM_ADDRESS, HAUtil.getRMHAId(conf)),
             YarnConfiguration.DEFAULT_RM_ADDRESS,
             YarnConfiguration.DEFAULT_RM_PORT);
-    List<String> oldRMAddresses = getRMAddresses(conf, proxyProviderWithmultiA.rmServiceIds, YarnConfiguration.RM_ADDRESS);
+    List<String> oldRMAddresses = getRMAddresses(
+        conf, proxyProviderWithmultiA.rmServiceIds, YarnConfiguration.RM_ADDRESS);
     for (String address : oldRMAddresses) {
       assertTrue(!address.equals(HOST_LIST.get(0)));
     }
@@ -209,7 +200,8 @@ public void testRefreshWithMultiARecordRM() throws UnknownHostException, Interru
         conf.getSocketAddr(HAUtil.addSuffix(YarnConfiguration.RM_ADDRESS, HAUtil.getRMHAId(conf)),
             YarnConfiguration.DEFAULT_RM_ADDRESS,
             YarnConfiguration.DEFAULT_RM_PORT);
-    List<String> newRMAddresses = getRMAddresses(conf, proxyProviderWithmultiA.rmServiceIds, YarnConfiguration.RM_ADDRESS);
+    List<String> newRMAddresses = getRMAddresses(
+        conf, proxyProviderWithmultiA.rmServiceIds, YarnConfiguration.RM_ADDRESS);
     assertEquals(HOST_LIST.size() - 1, newRMAddresses.size());
     // active RM should remain same, even without failover
     assertEquals(oldActiveRMAddress, newActiveRMAddress);
