diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java index bbe636f..a487fa8 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.io.PrintStream; import java.io.StringReader; +import java.net.URI; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -66,6 +67,7 @@ import org.codehaus.jettison.json.JSONObject; import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Joiner; import com.sun.jersey.api.client.Client; import com.sun.jersey.api.client.ClientHandlerException; import com.sun.jersey.api.client.ClientResponse; @@ -79,6 +81,7 @@ @Evolving public class LogsCLI extends Configured implements Tool { + private static final Joiner JOINER = Joiner.on(""); private static final String CONTAINER_ID_OPTION = "containerId"; private static final String APPLICATION_ID_OPTION = "applicationId"; private static final String NODE_ADDRESS_OPTION = "nodeAddress"; @@ -278,7 +281,9 @@ private void printHelpMessage(Options options) { Configuration conf, String appId) throws ClientHandlerException, UniformInterfaceException, JSONException { Client webServiceClient = Client.create(); - String webAppAddress = WebAppUtils.getRMWebAppURLWithScheme(conf); + String webAppAddress = WebAppUtils.getHttpSchemePrefix(conf) + + WebAppUtils.getWebAppBindURL(conf, YarnConfiguration.RM_BIND_HOST, + WebAppUtils.getRMWebAppURLWithoutScheme(conf)); WebResource webResource = webServiceClient.resource(webAppAddress); ClientResponse response =