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/10/16 17:12:33 UTC
git commit: SLIDER-431 AM uses HTTP when yarn configured for HTTPS
Repository: incubator-slider
Updated Branches:
refs/heads/develop fbfc76ada -> fe3560206
SLIDER-431 AM uses HTTP when yarn configured for HTTPS
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/fe356020
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/fe356020
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/fe356020
Branch: refs/heads/develop
Commit: fe35602060a2c87324eb968f03e2b0fed55c5e56
Parents: fbfc76a
Author: Jon Maron <jm...@hortonworks.com>
Authored: Thu Oct 16 11:12:06 2014 -0400
Committer: Jon Maron <jm...@hortonworks.com>
Committed: Thu Oct 16 11:12:06 2014 -0400
----------------------------------------------------------------------
.../org/apache/slider/server/appmaster/SliderAppMaster.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/fe356020/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 ef4d69c..119c6ab 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
@@ -27,6 +27,7 @@ import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hdfs.DFSConfigKeys;
import org.apache.hadoop.hdfs.security.token.delegation.DelegationTokenIdentifier;
+import org.apache.hadoop.http.HttpConfig;
import org.apache.hadoop.io.DataOutputBuffer;
import org.apache.hadoop.ipc.ProtocolSignature;
import org.apache.hadoop.registry.client.binding.RegistryUtils;
@@ -679,9 +680,9 @@ public class SliderAppMaster extends AbstractSliderLaunchedService
providerService,
certificateManager, registryOperations),
RestPaths.WS_CONTEXT)
- .with(serviceConf)
+ .withHttpPolicy(serviceConf, HttpConfig.Policy.HTTP_ONLY)
.start(webApp);
- String scheme = WebAppUtils.getHttpSchemePrefix(serviceConf);
+ String scheme = WebAppUtils.HTTP_PREFIX;
appMasterTrackingUrl = scheme + appMasterHostname + ":" + webApp.port();
WebAppService<SliderAMWebApp> webAppService =
new WebAppService<SliderAMWebApp>("slider", webApp);