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/04/15 01:10:29 UTC

hive git commit: HIVE-13465: Add ZK settings to MiniLlapCluster clusterSpecificConfiguration (Jason Dere, reviewed by Siddharth Seth)

Repository: hive
Updated Branches:
  refs/heads/master 2ba31f9e1 -> cc2d0f036


HIVE-13465: Add ZK settings to MiniLlapCluster clusterSpecificConfiguration (Jason Dere, reviewed by Siddharth Seth)


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

Branch: refs/heads/master
Commit: cc2d0f036739374234f9518a92d289c891ce047a
Parents: 2ba31f9
Author: Jason Dere <jd...@hortonworks.com>
Authored: Thu Apr 14 16:08:26 2016 -0700
Committer: Jason Dere <jd...@hortonworks.com>
Committed: Thu Apr 14 16:08:26 2016 -0700

----------------------------------------------------------------------
 .../org/apache/hadoop/hive/llap/daemon/MiniLlapCluster.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/cc2d0f03/llap-server/src/test/org/apache/hadoop/hive/llap/daemon/MiniLlapCluster.java
----------------------------------------------------------------------
diff --git a/llap-server/src/test/org/apache/hadoop/hive/llap/daemon/MiniLlapCluster.java b/llap-server/src/test/org/apache/hadoop/hive/llap/daemon/MiniLlapCluster.java
index 9871702..610f266 100644
--- a/llap-server/src/test/org/apache/hadoop/hive/llap/daemon/MiniLlapCluster.java
+++ b/llap-server/src/test/org/apache/hadoop/hive/llap/daemon/MiniLlapCluster.java
@@ -185,6 +185,10 @@ public class MiniLlapCluster extends AbstractService {
     conf.set(ConfVars.LLAP_DAEMON_SERVICE_HOSTS.varname, "@" + clusterNameTrimmed);
     conf.set(ConfVars.HIVE_ZOOKEEPER_QUORUM.varname, "localhost");
     conf.setInt(ConfVars.HIVE_ZOOKEEPER_CLIENT_PORT.varname, miniZooKeeperCluster.getClientPort());
+    // Also add ZK settings to clusterSpecificConf to make sure these get picked up by whoever started this.
+    clusterSpecificConfiguration.set(ConfVars.LLAP_DAEMON_SERVICE_HOSTS.varname, "@" + clusterNameTrimmed);
+    clusterSpecificConfiguration.set(ConfVars.HIVE_ZOOKEEPER_QUORUM.varname, "localhost");
+    clusterSpecificConfiguration.setInt(ConfVars.HIVE_ZOOKEEPER_CLIENT_PORT.varname, miniZooKeeperCluster.getClientPort());
   
     LOG.info("Initializing {} llap instances for MiniLlapCluster with name={}", numInstances, clusterNameTrimmed);
     for (int i = 0 ;i < numInstances ; i++) {
@@ -207,7 +211,6 @@ public class MiniLlapCluster extends AbstractService {
     // used by containers and LLAP
     clusterSpecificConfiguration
         .setBoolean(TezRuntimeConfiguration.TEZ_RUNTIME_OPTIMIZE_LOCAL_FETCH, false);
-    clusterSpecificConfiguration.set(ConfVars.LLAP_DAEMON_SERVICE_HOSTS.varname, "@" + clusterNameTrimmed);
   }
 
   @Override