From common-commits-return-82465-archive-asf-public=cust-asf.ponee.io@hadoop.apache.org Tue May 8 09:02:11 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 55D7318063B for ; Tue, 8 May 2018 09:02:11 +0200 (CEST) Received: (qmail 11507 invoked by uid 500); 8 May 2018 07:02:10 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 11498 invoked by uid 99); 8 May 2018 07:02:10 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 May 2018 07:02:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 398C5E09E9; Tue, 8 May 2018 07:02:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rohithsharmaks@apache.org To: common-commits@hadoop.apache.org Message-Id: <2d1a58639b3140c49c657824c4ea93b1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: YARN-8253. HTTPS Ats v2 api call fails with 'bad HTTP parsed'. Contributed by Charan Hebri. Date: Tue, 8 May 2018 07:02:10 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/branch-3.1 9355f56b3 -> b69c65fc6 YARN-8253. HTTPS Ats v2 api call fails with 'bad HTTP parsed'. Contributed by Charan Hebri. (cherry picked from commit 7450583721757b8af2945ebd9be1a9efed11444c) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b69c65fc Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b69c65fc Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b69c65fc Branch: refs/heads/branch-3.1 Commit: b69c65fc6baf5b4c21f5f9861bc11d981e9dafc1 Parents: 9355f56 Author: Rohith Sharma K S Authored: Tue May 8 12:28:54 2018 +0530 Committer: Rohith Sharma K S Committed: Tue May 8 12:31:35 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/b69c65fc/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