You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ss...@apache.org on 2017/07/14 23:11:30 UTC

hive git commit: HIVE-17093. LLAP ssl configs need to be localized to talk to a wire encrypted hdfs. (Siddharth Seth, reviewed by Gopal V)

Repository: hive
Updated Branches:
  refs/heads/master d3ba76d1e -> c27764c0d


HIVE-17093. LLAP ssl configs need to be localized to talk to a wire encrypted hdfs. (Siddharth Seth, reviewed by Gopal V)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/c27764c0
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/c27764c0
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/c27764c0

Branch: refs/heads/master
Commit: c27764c0d0b108b32a8261fdf5e586762263c9f2
Parents: d3ba76d
Author: Siddharth Seth <ss...@apache.org>
Authored: Fri Jul 14 16:10:58 2017 -0700
Committer: Siddharth Seth <ss...@apache.org>
Committed: Fri Jul 14 16:10:58 2017 -0700

----------------------------------------------------------------------
 .../hive/llap/configuration/LlapDaemonConfiguration.java    | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/c27764c0/llap-server/src/java/org/apache/hadoop/hive/llap/configuration/LlapDaemonConfiguration.java
----------------------------------------------------------------------
diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/configuration/LlapDaemonConfiguration.java b/llap-server/src/java/org/apache/hadoop/hive/llap/configuration/LlapDaemonConfiguration.java
index 7219d36..4fc7bd6 100644
--- a/llap-server/src/java/org/apache/hadoop/hive/llap/configuration/LlapDaemonConfiguration.java
+++ b/llap-server/src/java/org/apache/hadoop/hive/llap/configuration/LlapDaemonConfiguration.java
@@ -17,7 +17,6 @@ package org.apache.hadoop.hive.llap.configuration;
 import com.google.common.annotations.VisibleForTesting;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hive.common.classification.InterfaceAudience;
-import org.apache.hadoop.hive.conf.HiveConf;
 
 /**
  * Configuration for LLAP daemon processes only. This should not be used by any clients.
@@ -33,19 +32,13 @@ public class LlapDaemonConfiguration extends Configuration {
       "hdfs-site.xml", "yarn-site.xml", "tez-site.xml", "hive-site.xml" };
 
   @InterfaceAudience.Private
-  public static final String[] SSL_DAEMON_CONFIGS = { "ssl-server.xml" };
+  public static final String[] SSL_DAEMON_CONFIGS = { "ssl-client.xml" };
 
   public LlapDaemonConfiguration() {
     super(true); // Load the defaults.
     for (String conf : DAEMON_CONFIGS) {
       addResource(conf);
     }
-    /* load ssl secret configs */
-    if (HiveConf.getBoolVar(this, HiveConf.ConfVars.LLAP_DAEMON_WEB_SSL)) {
-      for (String conf : SSL_DAEMON_CONFIGS) {
-        addResource(conf);
-      }
-    }
     addResource(LLAP_DAEMON_SITE);
   }