You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@twill.apache.org by ch...@apache.org on 2014/04/22 08:06:25 UTC
[28/50] [abbrv] git commit: (TWILL-47) Fix the tracking url
registration
(TWILL-47) Fix the tracking url registration
1. Register the tracking URL without http:// for yarn-2.0.x.
2. Register without the "/resources" in path.
Signed-off-by: Terence Yim <te...@continuuity.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-twill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-twill/commit/9171d22c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-twill/tree/9171d22c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-twill/diff/9171d22c
Branch: refs/heads/site
Commit: 9171d22c5293ff6edc271d6a81194d2c6efdf9e0
Parents: e5c62e5
Author: Terence Yim <te...@continuuity.com>
Authored: Thu Feb 13 14:45:12 2014 -0800
Committer: Terence Yim <te...@continuuity.com>
Committed: Mon Feb 17 09:54:22 2014 -0800
----------------------------------------------------------------------
.../org/apache/twill/internal/yarn/Hadoop20YarnAMClient.java | 5 ++++-
.../org/apache/twill/internal/appmaster/TrackerService.java | 3 +--
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/9171d22c/twill-yarn/src/main/hadoop20/org/apache/twill/internal/yarn/Hadoop20YarnAMClient.java
----------------------------------------------------------------------
diff --git a/twill-yarn/src/main/hadoop20/org/apache/twill/internal/yarn/Hadoop20YarnAMClient.java b/twill-yarn/src/main/hadoop20/org/apache/twill/internal/yarn/Hadoop20YarnAMClient.java
index e773819..68d073d 100644
--- a/twill-yarn/src/main/hadoop20/org/apache/twill/internal/yarn/Hadoop20YarnAMClient.java
+++ b/twill-yarn/src/main/hadoop20/org/apache/twill/internal/yarn/Hadoop20YarnAMClient.java
@@ -93,9 +93,12 @@ public final class Hadoop20YarnAMClient extends AbstractIdleService implements Y
amrmClient.start();
+ String url = String.format("%s:%d",
+ trackerUrl.getHost(),
+ trackerUrl.getPort() == -1 ? trackerUrl.getDefaultPort() : trackerUrl.getPort());
RegisterApplicationMasterResponse response = amrmClient.registerApplicationMaster(trackerAddr.getHostName(),
trackerAddr.getPort(),
- trackerUrl.toString());
+ url);
maxCapability = response.getMaximumResourceCapability();
minCapability = response.getMinimumResourceCapability();
}
http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/9171d22c/twill-yarn/src/main/java/org/apache/twill/internal/appmaster/TrackerService.java
----------------------------------------------------------------------
diff --git a/twill-yarn/src/main/java/org/apache/twill/internal/appmaster/TrackerService.java b/twill-yarn/src/main/java/org/apache/twill/internal/appmaster/TrackerService.java
index 8ff5184..a9553c9 100644
--- a/twill-yarn/src/main/java/org/apache/twill/internal/appmaster/TrackerService.java
+++ b/twill-yarn/src/main/java/org/apache/twill/internal/appmaster/TrackerService.java
@@ -145,8 +145,7 @@ public final class TrackerService extends AbstractIdleService {
Channel channel = bootstrap.bind(new InetSocketAddress(host, 0));
bindAddress = (InetSocketAddress) channel.getLocalAddress();
- url = URI.create(String.format("http://%s:%d", host, bindAddress.getPort()))
- .resolve(TrackerService.PATH).toURL();
+ url = URI.create(String.format("http://%s:%d", host, bindAddress.getPort())).toURL();
channelGroup.add(channel);
}