YARN-11634. [Addendum] Speed-up TestTimelineClient.

Author: slfan1989

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineClientImpl.java

@@ -459,4 +459,10 @@ public void putDomain(ApplicationAttemptId appAttemptId,
   public void setTimelineWriter(TimelineWriter writer) {
     this.timelineWriter = writer;
   }
+
+  @Private
+  @VisibleForTesting
+  public TimelineConnector getConnector() {
+    return connector;
+  }
 }

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineConnector.java

@@ -78,8 +78,8 @@ public class TimelineConnector extends AbstractService {
   private static final Joiner JOINER = Joiner.on("");
   private static final Logger LOG =
       LoggerFactory.getLogger(TimelineConnector.class);
-  @VisibleForTesting
-  public static int DEFAULT_SOCKET_TIMEOUT = 60_000; // 1 minute
+
+  private int socketTimeOut = 60_000;
 
   private SSLFactory sslFactory;
   Client client;
@@ -145,14 +145,14 @@ protected void serviceInit(Configuration conf) throws Exception {
         @Override
         public HttpURLConnection configure(HttpURLConnection conn)
             throws IOException {
-          setTimeouts(conn, DEFAULT_SOCKET_TIMEOUT);
+          setTimeouts(conn, 60_000);
           return conn;
         }
       };
 
   private ConnectionConfigurator getConnConfigurator(SSLFactory sslFactoryObj) {
     try {
-      return initSslConnConfigurator(DEFAULT_SOCKET_TIMEOUT, sslFactoryObj);
+      return initSslConnConfigurator(socketTimeOut, sslFactoryObj);
     } catch (Exception e) {
       LOG.debug("Cannot load customized ssl related configuration. "
           + "Fallback to system-generic settings.", e);
@@ -457,4 +457,9 @@ public boolean shouldRetryOn(Exception e) {
           || e instanceof SocketTimeoutException);
     }
   }
+
+  @VisibleForTesting
+  public void setSocketTimeOut(int socketTimeOut) {
+    this.socketTimeOut = socketTimeOut;
+  }
 }

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestTimelineClient.java

@@ -78,7 +78,7 @@ public void setup() {
     conf.setBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED, true);
     conf.setFloat(YarnConfiguration.TIMELINE_SERVICE_VERSION, 1.0f);
     client = createTimelineClient(conf);
-    TimelineConnector.DEFAULT_SOCKET_TIMEOUT = 10;
+    client.getConnector().setSocketTimeOut(10);
   }
 
   @AfterEach
@@ -89,7 +89,7 @@ public void tearDown() throws Exception {
     if (isSSLConfigured()) {
       KeyStoreTestUtil.cleanupSSLConfig(keystoresDir, sslConfDir);
     }
-    TimelineConnector.DEFAULT_SOCKET_TIMEOUT = 60_000;
+    client.getConnector().setSocketTimeOut(60_1000);
   }
 
   @Test