diff --git service/src/java/org/apache/hive/service/server/HiveServer2.java service/src/java/org/apache/hive/service/server/HiveServer2.java index a93cc1b7e1..4c00ba30c7 100644 --- service/src/java/org/apache/hive/service/server/HiveServer2.java +++ service/src/java/org/apache/hive/service/server/HiveServer2.java @@ -605,10 +605,8 @@ public void process(WatchedEvent event) { */ public boolean isDeregisteredWithZooKeeper() { if (serviceDiscovery && !activePassiveHA) { - synchronized(this) { - if (zooKeeperHelper != null) { - return zooKeeperHelper.isDeregisteredWithZooKeeper(); - } + if (zooKeeperHelper != null) { + return zooKeeperHelper.isDeregisteredWithZooKeeper(); } } return false; diff --git standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ZooKeeperHiveHelper.java standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ZooKeeperHiveHelper.java index eb5a4e6f0d..99f7c97877 100644 --- standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ZooKeeperHiveHelper.java +++ standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/ZooKeeperHiveHelper.java @@ -205,11 +205,11 @@ public void deregisterZnode() { } } - public boolean isDeregisteredWithZooKeeper() { + public synchronized boolean isDeregisteredWithZooKeeper() { return deregisteredWithZooKeeper; } - private void setDeregisteredWithZooKeeper(boolean deregisteredWithZooKeeper) { + private synchronized void setDeregisteredWithZooKeeper(boolean deregisteredWithZooKeeper) { this.deregisteredWithZooKeeper = deregisteredWithZooKeeper; }