You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by jm...@apache.org on 2014/09/15 21:15:41 UTC
git commit: SLIDER-424 use correct uri scheme based on configuration
Repository: incubator-slider
Updated Branches:
refs/heads/develop 3511026c3 -> b5698ab90
SLIDER-424 use correct uri scheme based on configuration
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/b5698ab9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/b5698ab9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/b5698ab9
Branch: refs/heads/develop
Commit: b5698ab9078afd577d6ac97fa23936bb0e103c2c
Parents: 3511026
Author: Jon Maron <jm...@hortonworks.com>
Authored: Mon Sep 15 15:15:10 2014 -0400
Committer: Jon Maron <jm...@hortonworks.com>
Committed: Mon Sep 15 15:15:10 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/slider/server/appmaster/SliderAppMaster.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b5698ab9/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 1c60b69..08d0049 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
@@ -56,6 +56,7 @@ import org.apache.hadoop.yarn.security.AMRMTokenIdentifier;
import org.apache.hadoop.yarn.security.client.ClientToAMTokenSecretManager;
import org.apache.hadoop.yarn.util.ConverterUtils;
import org.apache.hadoop.yarn.webapp.WebApps;
+import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
import org.apache.slider.api.ClusterDescription;
import org.apache.slider.api.InternalKeys;
import org.apache.slider.api.ResourceKeys;
@@ -646,7 +647,8 @@ public class SliderAppMaster extends AbstractSliderLaunchedService
RestPaths.WS_CONTEXT)
.with(serviceConf)
.start(webApp);
- appMasterTrackingUrl = "http://" + appMasterHostname + ":" + webApp.port();
+ String scheme = WebAppUtils.getHttpSchemePrefix(serviceConf);
+ appMasterTrackingUrl = scheme + appMasterHostname + ":" + webApp.port();
WebAppService<SliderAMWebApp> webAppService =
new WebAppService<SliderAMWebApp>("slider", webApp);