Skip to content

Commit

Permalink
HIVE-17093. LLAP ssl configs need to be localized to talk to a wire e…
Browse files Browse the repository at this point in the history
…ncrypted hdfs. (Siddharth Seth, reviewed by Gopal V)
  • Loading branch information
sidseth committed Jul 14, 2017
1 parent d3ba76d commit c27764c
Showing 1 changed file with 1 addition and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
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.
Expand All @@ -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);
}

Expand Down

0 comments on commit c27764c

Please sign in to comment.