From 5e8bbd69334323fbd5fb97e93332852711ff391e Mon Sep 17 00:00:00 2001 From: Pankaj Kumar Date: Sat, 19 Aug 2017 00:33:49 +0800 Subject: [PATCH] HBASE-14498 Master stuck in infinite loop when all Zookeeper servers are unreachable (Addendum) --- .../java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java index 8266c9a..b5f7dec 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java @@ -21,9 +21,7 @@ package org.apache.hadoop.hbase.zookeeper; import java.io.Closeable; import java.io.IOException; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; @@ -37,8 +35,6 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Abortable; import org.apache.hadoop.hbase.AuthUtil; -import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.ZooKeeperConnectionException; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.security.Superusers; @@ -573,7 +569,7 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable { ZKDisconnectEventWatcher task = new ZKDisconnectEventWatcher(); zkEventWatcherExecService.execute(task); } else { - LOG.debug("Received Disconnected from ZooKeeper, ignoring."); + LOG.debug(prefix("Received Disconnected from ZooKeeper, ignoring.")); } break; @@ -610,7 +606,7 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable { long startTime = EnvironmentEdgeManager.currentTime(); while (EnvironmentEdgeManager.currentTime() - startTime < connWaitTimeOut) { if (connected.get()) { - LOG.debug("Client got reconnected to zookeeper."); + LOG.debug(prefix("Client got reconnected to zookeeper.")); return; } try { -- 2.7.2.windows.1