You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by se...@apache.org on 2017/01/13 21:04:23 UTC
hive git commit: HIVE-15590 : add separate spnego principal config
for LLAP Web UI (Sergey Shelukhin, reviewed by Gopal V)
Repository: hive
Updated Branches:
refs/heads/master 7d39212c5 -> c8a0cb006
HIVE-15590 : add separate spnego principal config for LLAP Web UI (Sergey Shelukhin, 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/c8a0cb00
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/c8a0cb00
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/c8a0cb00
Branch: refs/heads/master
Commit: c8a0cb006e7865c70e60a56db85e981a7b7d92d4
Parents: 7d39212
Author: Sergey Shelukhin <se...@apache.org>
Authored: Fri Jan 13 13:03:54 2017 -0800
Committer: Sergey Shelukhin <se...@apache.org>
Committed: Fri Jan 13 13:04:17 2017 -0800
----------------------------------------------------------------------
common/src/java/org/apache/hadoop/hive/conf/HiveConf.java | 6 ++++++
.../hadoop/hive/llap/daemon/services/impl/LlapWebServices.java | 6 ++++--
2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/c8a0cb00/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
----------------------------------------------------------------------
diff --git a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
index c88ca87..96928db 100644
--- a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
+++ b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
@@ -2957,6 +2957,12 @@ public class HiveConf extends Configuration {
LLAP_ZKSM_KERBEROS_KEYTAB_FILE("hive.llap.zk.sm.keytab.file", "",
"The path to the Kerberos Keytab file containing the principal to use to talk to\n" +
"ZooKeeper for ZooKeeper SecretManager."),
+ LLAP_WEBUI_SPNEGO_KEYTAB_FILE("hive.llap.webui.spnego.keytab", "",
+ "The path to the Kerberos Keytab file containing the LLAP WebUI SPNEGO principal.\n" +
+ "Typical value would look like /etc/security/keytabs/spnego.service.keytab."),
+ LLAP_WEBUI_SPNEGO_PRINCIPAL("hive.llap.webui.spnego.principal", "",
+ "The LLAP WebUI SPNEGO service principal. Configured similarly to\n" +
+ "hive.server2.webui.spnego.principal"),
LLAP_FS_KERBEROS_PRINCIPAL("hive.llap.task.principal", "",
"The name of the principal to use to run tasks. By default, the clients are required\n" +
"to provide tokens to access HDFS/etc."),
http://git-wip-us.apache.org/repos/asf/hive/blob/c8a0cb00/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/services/impl/LlapWebServices.java
----------------------------------------------------------------------
diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/services/impl/LlapWebServices.java b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/services/impl/LlapWebServices.java
index 0614355..028daa1 100644
--- a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/services/impl/LlapWebServices.java
+++ b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/services/impl/LlapWebServices.java
@@ -88,8 +88,10 @@ public class LlapWebServices extends AbstractService {
builder.setUseSSL(this.useSSL);
if (this.useSPNEGO) {
builder.setUseSPNEGO(true); // this setups auth filtering in build()
- builder.setSPNEGOPrincipal(HiveConf.getVar(conf, ConfVars.LLAP_KERBEROS_PRINCIPAL));
- builder.setSPNEGOKeytab(HiveConf.getVar(conf, ConfVars.LLAP_KERBEROS_KEYTAB_FILE));
+ builder.setSPNEGOPrincipal(HiveConf.getVar(conf, ConfVars.LLAP_WEBUI_SPNEGO_PRINCIPAL,
+ HiveConf.getVar(conf, ConfVars.LLAP_KERBEROS_PRINCIPAL)));
+ builder.setSPNEGOKeytab(HiveConf.getVar(conf, ConfVars.LLAP_WEBUI_SPNEGO_KEYTAB_FILE,
+ HiveConf.getVar(conf, ConfVars.LLAP_KERBEROS_KEYTAB_FILE)));
}
}