From 13dbcf86294dfbe988c0727c09c081884bd337ee Mon Sep 17 00:00:00 2001 From: Sanjay Pujare Date: Sun, 7 May 2017 23:47:16 -0700 Subject: [PATCH] YARN-6457 use existing conf object as a resource for sslConf object in WebApps for the builder to use in HttpServer2 --- .../java/org/apache/hadoop/yarn/webapp/util/WebAppUtils.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/util/WebAppUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/util/WebAppUtils.java index 64a4b2b..007bfb7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/util/WebAppUtils.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/util/WebAppUtils.java @@ -378,13 +378,15 @@ public static String getHttpSchemePrefix(Configuration conf) { * @param sslConf the Configuration instance to use during loading of SSL conf */ public static HttpServer2.Builder loadSslConfiguration( - HttpServer2.Builder builder, Configuration sslConf) { - if (sslConf == null) { - sslConf = new Configuration(false); + HttpServer2.Builder builder, Configuration conf) { + + Configuration sslConf = new Configuration(false); + + sslConf.addResource(YarnConfiguration.YARN_SSL_SERVER_RESOURCE_DEFAULT); + if (conf != null) { + sslConf.addResource(conf); } boolean needsClientAuth = YarnConfiguration.YARN_SSL_CLIENT_HTTPS_NEED_AUTH_DEFAULT; - sslConf.addResource(YarnConfiguration.YARN_SSL_SERVER_RESOURCE_DEFAULT); - return builder .needsClientAuth(needsClientAuth) .keyPassword(getPassword(sslConf, WEB_APP_KEY_PASSWORD_KEY))