Revert "YARN-9606. Set sslfactory for AuthenticatedURL() while creating LogsCLI#webServiceClient."

This reverts commit 7836bc4.

Author: aajisaka

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml

@@ -119,6 +119,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-yarn-server-common</artifactId>
+      <scope>test</scope>
     </dependency>
     <!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
     <dependency>

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java

@@ -27,13 +27,17 @@
 import com.sun.jersey.api.client.WebResource;
 import com.sun.jersey.api.client.WebResource.Builder;
 import com.sun.jersey.api.client.filter.ClientFilter;
+import com.sun.jersey.client.urlconnection.HttpURLConnectionFactory;
+import com.sun.jersey.client.urlconnection.URLConnectionClientHandler;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
 import java.net.ConnectException;
+import java.net.HttpURLConnection;
 import java.net.SocketException;
 import java.net.SocketTimeoutException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -64,6 +68,8 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.conf.Configured;
 import org.apache.hadoop.security.UserGroupInformation;
+import org.apache.hadoop.security.authentication.client.AuthenticatedURL;
+import org.apache.hadoop.security.authentication.client.AuthenticationException;
 import org.apache.hadoop.util.Tool;
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptReport;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
@@ -81,7 +87,6 @@
 import org.apache.hadoop.yarn.logaggregation.LogCLIHelpers;
 import org.apache.hadoop.yarn.logaggregation.LogToolUtils;
 import org.apache.hadoop.yarn.server.metrics.AppAttemptMetricsConstants;
-import org.apache.hadoop.yarn.server.webapp.WebServiceClient;
 import org.apache.hadoop.yarn.util.Apps;
 import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
 import org.apache.hadoop.yarn.webapp.util.YarnWebServiceUtils;
@@ -117,7 +122,7 @@ public class LogsCLI extends Configured implements Tool {
 
   private PrintStream outStream = System.out;
   private YarnClient yarnClient = null;
-  private Client client = null;
+  private Client webServiceClient = null;
 
   private static final int DEFAULT_MAX_RETRIES = 30;
   private static final long DEFAULT_RETRY_INTERVAL = 1000;
@@ -134,14 +139,28 @@ public class LogsCLI extends Configured implements Tool {
   @Override
   public int run(String[] args) throws Exception {
     try {
-      client = WebServiceClient.getWebServiceClient().createClient();
+      webServiceClient = new Client(new URLConnectionClientHandler(
+          new HttpURLConnectionFactory() {
+          @Override
+          public HttpURLConnection getHttpURLConnection(URL url)
+              throws IOException {
+            AuthenticatedURL.Token token = new AuthenticatedURL.Token();
+            HttpURLConnection conn = null;
+            try {
+              conn = new AuthenticatedURL().openConnection(url, token);
+            } catch (AuthenticationException e) {
+              throw new IOException(e);
+            }
+            return conn;
+          }
+        }));
       return runCommand(args);
     } finally {
       if (yarnClient != null) {
         yarnClient.close();
       }
-      if (client != null) {
-        client.destroy();
+      if (webServiceClient != null) {
+        webServiceClient.destroy();
       }
     }
   }
@@ -291,7 +310,7 @@ private int runCommand(String[] args) throws Exception {
     // Set up Retry WebService Client
     connectionRetry = new ClientConnectionRetry(maxRetries, retryInterval);
     ClientJerseyRetryFilter retryFilter = new ClientJerseyRetryFilter();
-    client.addFilter(retryFilter);
+    webServiceClient.addFilter(retryFilter);
 
     LogCLIHelpers logCliHelper = new LogCLIHelpers();
     logCliHelper.setConf(getConf());
@@ -392,9 +411,7 @@ public static void main(String[] args) throws Exception {
     Configuration conf = new YarnConfiguration();
     LogsCLI logDumper = new LogsCLI();
     logDumper.setConf(conf);
-    WebServiceClient.initialize(conf);
     int exitCode = logDumper.run(args);
-    WebServiceClient.destroy();
     System.exit(exitCode);
   }
 
@@ -419,7 +436,7 @@ private List<JSONObject> getAMContainerInfoFromRM(
     List<JSONObject> amContainersList = new ArrayList<JSONObject>();
     ClientResponse response = null;
     try {
-      Builder builder = client.resource(webAppAddress)
+      Builder builder = webServiceClient.resource(webAppAddress)
           .path("ws").path("v1").path("cluster")
           .path("apps").path(appId).path("appattempts")
           .accept(MediaType.APPLICATION_JSON);
@@ -444,7 +461,7 @@ private List<JSONObject> getAMContainerInfoForAHSWebService(
     String webAppAddress =
         WebAppUtils.getHttpSchemePrefix(conf)
             + WebAppUtils.getAHSWebAppURLWithoutScheme(conf);
-    WebResource webResource = client.resource(webAppAddress);
+    WebResource webResource = webServiceClient.resource(webAppAddress);
 
     ClientResponse response =
         webResource.path("ws").path("v1").path("applicationhistory")
@@ -494,7 +511,7 @@ private List<Pair<ContainerLogFileInfo, String>> getContainerLogFiles(
     List<Pair<ContainerLogFileInfo, String>> logFileInfos
         = new ArrayList<>();
     try {
-      WebResource webResource = client
+      WebResource webResource = webServiceClient
           .resource(WebAppUtils.getHttpSchemePrefix(conf) + nodeHttpAddress);
       ClientResponse response =
           webResource.path("ws").path("v1").path("node").path("containers")
@@ -582,7 +599,7 @@ public int printContainerLogsFromRunningApplication(Configuration conf,
         InputStream is = null;
         try {
           ClientResponse response = getResponseFromNMWebService(conf,
-              client, request, logFile);
+              webServiceClient, request, logFile);
           if (response != null && response.getStatusInfo().getStatusCode() ==
               ClientResponse.Status.OK.getStatusCode()) {
             is = response.getEntityInputStream();
@@ -794,7 +811,7 @@ protected ClientResponse getClientResponseFromTimelineReader(
       Configuration conf, String appId) throws IOException {
     String webAppAddress = WebAppUtils.getHttpSchemePrefix(conf) + WebAppUtils
         .getTimelineReaderWebAppURLWithoutScheme(conf);
-    WebResource webResource = client.resource(webAppAddress);
+    WebResource webResource = webServiceClient.resource(webAppAddress);
 
     ClientResponse response =
         webResource.path("ws").path("v2").path("timeline").path("clusters")