Repository: hadoop Updated Branches: refs/heads/branch-2 c29fbdd8a -> 67dbd4c46
YARN-5080. Addendum fix to the original patch to fix YARN logs CLI. Contributed by Xuan Gong (cherry picked from commit 5a43583c0bbb9650ea6a9f48d9544ec3ec24b580) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/67dbd4c4 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/67dbd4c4 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/67dbd4c4 Branch: refs/heads/branch-2 Commit: 67dbd4c466c8e71181dc9c681ab9b95b1f56039b Parents: c29fbdd Author: Vinod Kumar Vavilapalli <[email protected]> Authored: Wed Jun 8 09:49:55 2016 -0700 Committer: Vinod Kumar Vavilapalli <[email protected]> Committed: Wed Jun 8 09:51:36 2016 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/67dbd4c4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java index bbe636f..d62ee5e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java @@ -278,7 +278,9 @@ public class LogsCLI extends Configured implements Tool { 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 = --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
