Repository: incubator-slider Updated Branches: refs/heads/develop 3627d5d07 -> 72baea6dd
SLIDER-1088 Slider client getting UnknownHost exception trying to RPC to AM in different subdomain Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/14cf4d39 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/14cf4d39 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/14cf4d39 Branch: refs/heads/develop Commit: 14cf4d39a2aa2e7d2b985070de6c6299646e4135 Parents: 3627d5d Author: Steve Loughran <ste...@apache.org> Authored: Fri Feb 19 22:22:29 2016 +0000 Committer: Steve Loughran <ste...@apache.org> Committed: Fri Feb 19 22:22:29 2016 +0000 ---------------------------------------------------------------------- .../src/main/java/org/apache/slider/api/ClusterNode.java | 4 ++-- .../main/java/org/apache/slider/common/tools/SliderUtils.java | 2 +- .../org/apache/slider/server/appmaster/SliderAppMaster.java | 2 +- .../slider/agent/standalone/TestStandaloneAgentAM.groovy | 7 +++++++ 4 files changed, 11 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/14cf4d39/slider-core/src/main/java/org/apache/slider/api/ClusterNode.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/api/ClusterNode.java b/slider-core/src/main/java/org/apache/slider/api/ClusterNode.java index d255db0..e05a2ef 100644 --- a/slider-core/src/main/java/org/apache/slider/api/ClusterNode.java +++ b/slider-core/src/main/java/org/apache/slider/api/ClusterNode.java @@ -135,9 +135,9 @@ public final class ClusterNode implements Cloneable { return builder.toString(); } - private void append(StringBuilder builder, String name, Object val) { + private void append(StringBuilder builder, String key, Object val) { if (val != null) { - builder.append(name).append(val.toString()).append("\n"); + builder.append(key).append(": ").append(val.toString()).append("\n"); } } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/14cf4d39/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java b/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java index 9c0547f..5f5599c 100644 --- a/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java +++ b/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java @@ -1071,7 +1071,7 @@ public final class SliderUtils { report.getApplicationId() + " user " + report.getUser() + " is in state " + report.getYarnApplicationState() + " RPC: " + report.getHost() + ":" + report.getRpcPort() + - " URL" + report.getOriginalTrackingUrl(); + " URL: " + report.getOriginalTrackingUrl(); } /** http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/14cf4d39/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java index 3f609b1..3112880 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java @@ -748,7 +748,7 @@ public class SliderAppMaster extends AbstractSliderLaunchedService startSliderRPCServer(instanceDefinition); rpcServiceAddress = rpcService.getConnectAddress(); - appMasterHostname = rpcServiceAddress.getHostName(); + appMasterHostname = rpcServiceAddress.getAddress().getCanonicalHostName(); appMasterRpcPort = rpcServiceAddress.getPort(); appMasterTrackingUrl = null; log.info("AM Server is listening at {}:{}", appMasterHostname, appMasterRpcPort); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/14cf4d39/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy index eaf4386..34e5043 100644 --- a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy @@ -62,6 +62,7 @@ class TestStandaloneAgentAM extends AgentMiniClusterTestBase { String clustername = createMiniCluster("", configuration, 1, true) + describe("Launching AM") ServiceLauncher<SliderClient> launcher = createStandaloneAM(clustername, true, false) SliderClient client = launcher.service @@ -102,6 +103,12 @@ class TestStandaloneAgentAM extends AgentMiniClusterTestBase { def serviceRegistryClient = client.yarnAppListClient describe("list of all applications") logApplications(apps) + assert 1 == apps.size() + def appReport = apps.head() + assert appReport.host + assert appReport.host.contains(".") + assert appReport.originalTrackingUrl.contains(appReport.host) + describe("apps of user $username") List<ApplicationReport> userInstances = serviceRegistryClient.listInstances() logApplications(userInstances)