diff options
author | Reynold Xin <rxin@databricks.com> | 2016-04-29 13:32:08 -0700 |
---|---|---|
committer | Reynold Xin <rxin@databricks.com> | 2016-04-29 13:32:08 -0700 |
commit | 8ebae466a399f4373b4cc881936d8de9d4b946ed (patch) | |
tree | 220f67a296c23849feba573208d81a8a4a3262c3 /sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/session/SessionManager.java | |
parent | ac115f6628f6e8b8ff83b7492e41c60b3573dd81 (diff) | |
download | spark-8ebae466a399f4373b4cc881936d8de9d4b946ed.tar.gz spark-8ebae466a399f4373b4cc881936d8de9d4b946ed.tar.bz2 spark-8ebae466a399f4373b4cc881936d8de9d4b946ed.zip |
[SPARK-15004][SQL] Remove zookeeper service discovery code in thrift-server
## What changes were proposed in this pull request?
We recently inlined Hive's thrift server code in SPARK-15004. This patch removes the code related to zookeeper service discovery, Tez, and Hive on Spark, since they are irrelevant.
## How was this patch tested?
N/A - removing dead code
Author: Reynold Xin <rxin@databricks.com>
Closes #12780 from rxin/SPARK-15004.
Diffstat (limited to 'sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/session/SessionManager.java')
-rw-r--r-- | sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/session/SessionManager.java | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/session/SessionManager.java b/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/session/SessionManager.java index 36a30b1e28..e31570bdfb 100644 --- a/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/session/SessionManager.java +++ b/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/session/SessionManager.java @@ -288,28 +288,7 @@ public class SessionManager extends CompositeService { if (session == null) { throw new HiveSQLException("Session does not exist!"); } - try { - session.close(); - } finally { - // Shutdown HiveServer2 if it has been deregistered from ZooKeeper and has no active sessions - if (!(hiveServer2 == null) && (hiveConf.getBoolVar(ConfVars.HIVE_SERVER2_SUPPORT_DYNAMIC_SERVICE_DISCOVERY)) - && (!hiveServer2.isRegisteredWithZooKeeper())) { - // Asynchronously shutdown this instance of HiveServer2, - // if there are no active client sessions - if (getOpenSessionCount() == 0) { - LOG.info("This instance of HiveServer2 has been removed from the list of server " - + "instances available for dynamic service discovery. " - + "The last client session has ended - will shutdown now."); - Thread shutdownThread = new Thread() { - @Override - public void run() { - hiveServer2.stop(); - } - }; - shutdownThread.start(); - } - } - } + session.close(); } public HiveSession getSession(SessionHandle sessionHandle) throws HiveSQLException { |