You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by jd...@apache.org on 2016/07/14 16:39:24 UTC
hive git commit: HIVE-14180: Disable LlapZookeeperRegistry ZK auth
setup for external clients (Jason Dere, reviewed by Sergey Shelukhin)
Repository: hive
Updated Branches:
refs/heads/master feedee4c9 -> aab020f0f
HIVE-14180: Disable LlapZookeeperRegistry ZK auth setup for external clients (Jason Dere, reviewed by Sergey Shelukhin)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/aab020f0
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/aab020f0
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/aab020f0
Branch: refs/heads/master
Commit: aab020f0f44db4175fb0b292653dcdd9959731d3
Parents: feedee4
Author: Jason Dere <jd...@hortonworks.com>
Authored: Thu Jul 14 09:40:11 2016 -0700
Committer: Jason Dere <jd...@hortonworks.com>
Committed: Thu Jul 14 09:40:11 2016 -0700
----------------------------------------------------------------------
.../hive/llap/registry/impl/LlapZookeeperRegistryImpl.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/aab020f0/llap-client/src/java/org/apache/hadoop/hive/llap/registry/impl/LlapZookeeperRegistryImpl.java
----------------------------------------------------------------------
diff --git a/llap-client/src/java/org/apache/hadoop/hive/llap/registry/impl/LlapZookeeperRegistryImpl.java b/llap-client/src/java/org/apache/hadoop/hive/llap/registry/impl/LlapZookeeperRegistryImpl.java
index d836fd6..ae8dcc4 100644
--- a/llap-client/src/java/org/apache/hadoop/hive/llap/registry/impl/LlapZookeeperRegistryImpl.java
+++ b/llap-client/src/java/org/apache/hadoop/hive/llap/registry/impl/LlapZookeeperRegistryImpl.java
@@ -51,6 +51,7 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
import org.apache.hadoop.hive.llap.LlapUtil;
+import org.apache.hadoop.hive.llap.io.api.LlapProxy;
import org.apache.hadoop.hive.llap.registry.ServiceInstance;
import org.apache.hadoop.hive.llap.registry.ServiceInstanceSet;
import org.apache.hadoop.hive.llap.registry.ServiceInstanceStateChangeListener;
@@ -702,7 +703,7 @@ public class LlapZookeeperRegistryImpl implements ServiceRegistry {
private void setupZookeeperAuth(final Configuration conf) throws IOException {
- if (UserGroupInformation.isSecurityEnabled()) {
+ if (UserGroupInformation.isSecurityEnabled() && LlapProxy.isDaemon()) {
LOG.info("UGI security is enabled. Setting up ZK auth.");
String llapPrincipal = HiveConf.getVar(conf, ConfVars.LLAP_KERBEROS_PRINCIPAL);
@@ -718,7 +719,7 @@ public class LlapZookeeperRegistryImpl implements ServiceRegistry {
// Install the JAAS Configuration for the runtime
setZookeeperClientKerberosJaasConfig(llapPrincipal, llapKeytab);
} else {
- LOG.info("UGI security is not enabled. Skipping setting up ZK auth.");
+ LOG.info("UGI security is not enabled, or non-daemon environment. Skipping setting up ZK auth.");
}
}