You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by xy...@apache.org on 2018/05/09 17:40:50 UTC
[12/26] hadoop git commit: YARN-8253. HTTPS Ats v2 api call fails
with 'bad HTTP parsed'. Contributed by Charan Hebri.
YARN-8253. HTTPS Ats v2 api call fails with 'bad HTTP parsed'. Contributed by Charan Hebri.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/74505837
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/74505837
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/74505837
Branch: refs/heads/HDDS-4
Commit: 7450583721757b8af2945ebd9be1a9efed11444c
Parents: 2916c90
Author: Rohith Sharma K S <ro...@apache.org>
Authored: Tue May 8 12:28:54 2018 +0530
Committer: Rohith Sharma K S <ro...@apache.org>
Committed: Tue May 8 12:28:54 2018 +0530
----------------------------------------------------------------------
.../server/timelineservice/reader/TimelineReaderServer.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/74505837/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderServer.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderServer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderServer.java
index 2f85c04..bd2c428 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderServer.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderServer.java
@@ -186,10 +186,17 @@ public class TimelineReaderServer extends CompositeService {
LOG.info("Instantiating TimelineReaderWebApp at " + bindAddress);
try {
+
+ String httpScheme = WebAppUtils.getHttpSchemePrefix(conf);
+
HttpServer2.Builder builder = new HttpServer2.Builder()
.setName("timeline")
.setConf(conf)
- .addEndpoint(URI.create("http://" + bindAddress));
+ .addEndpoint(URI.create(httpScheme + bindAddress));
+
+ if (httpScheme.equals(WebAppUtils.HTTPS_PREFIX)) {
+ WebAppUtils.loadSslConfiguration(builder, conf);
+ }
readerWebServer = builder.build();
readerWebServer.addJerseyResourcePackage(
TimelineReaderWebServices.class.getPackage().getName() + ";"
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org