HBASE-22638 ZooKeeper Utility enhancements

Signed-off-by: Jan Hentschel <jan.hentschel@ultratendency.com>

hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java

@@ -54,21 +54,21 @@ public class MiniZooKeeperCluster {
 
   private static final int TICK_TIME = 2000;
   private static final int DEFAULT_CONNECTION_TIMEOUT = 30000;
-  private int connectionTimeout;
+  private final int connectionTimeout;
 
   private boolean started;
 
   /** The default port. If zero, we use a random port. */
   private int defaultClientPort = 0;
 
-  private List<NIOServerCnxnFactory> standaloneServerFactoryList;
+  private final List<NIOServerCnxnFactory> standaloneServerFactoryList;
-  private List<ZooKeeperServer> zooKeeperServers;
+  private final List<ZooKeeperServer> zooKeeperServers;
-  private List<Integer> clientPortList;
+  private final List<Integer> clientPortList;
 
   private int activeZKServerIndex;
   private int tickTime = 0;
 
-  private Configuration configuration;
+  private final Configuration configuration;
 
   public MiniZooKeeperCluster() {
     this(new Configuration());
@@ -96,6 +96,7 @@ public class MiniZooKeeperCluster {
 
   /**
    * Get the list of client ports.
+   *
    * @return clientPortList the client port list
    */
   @VisibleForTesting
@@ -141,7 +142,8 @@ public class MiniZooKeeperCluster {
       }
     }
     // Make sure that the port is unused.
-    while (true) {
+    // break when an unused port is found
+    do {
       for (i = 0; i < clientPortList.size(); i++) {
         if (returnClientPort == clientPortList.get(i)) {
           // Already used. Update the port and retry.
@@ -149,10 +151,7 @@ public class MiniZooKeeperCluster {
           break;
         }
       }
-      if (i == clientPortList.size()) {
+    } while (i != clientPortList.size());
-        break; // found a unused port, exit
-      }
-    }
     return returnClientPort;
   }
 
@@ -161,7 +160,7 @@ public class MiniZooKeeperCluster {
   }
 
   public int getBackupZooKeeperServerNum() {
-    return zooKeeperServers.size()-1;
+    return zooKeeperServers.size() - 1;
   }
 
   public int getZooKeeperServerNum() {
@@ -177,7 +176,7 @@ public class MiniZooKeeperCluster {
     System.setProperty("zookeeper.preAllocSize", "100");
     FileTxnLog.setPreallocSize(100 * 1024);
     // allow all 4 letter words
-    System.setProperty("zookeeper.4lw.commands.whitelist","*");
+    System.setProperty("zookeeper.4lw.commands.whitelist", "*");
   }
 
   public int startup(File baseDir) throws IOException, InterruptedException {
@@ -210,7 +209,7 @@ public class MiniZooKeeperCluster {
 
     // running all the ZK servers
     for (int i = 0; i < numZooKeeperServers; i++) {
-      File dir = new File(baseDir, "zookeeper_"+i).getAbsoluteFile();
+      File dir = new File(baseDir, "zookeeper_" + i).getAbsoluteFile();
       createDir(dir);
       int tickTimeToUse;
       if (this.tickTime > 0) {
@@ -266,8 +265,7 @@ public class MiniZooKeeperCluster {
       // We have selected a port as a client port.  Update clientPortList if necessary.
       if (clientPortList.size() <= i) { // it is not in the list, add the port
         clientPortList.add(currentClientPort);
-      }
+      } else if (clientPortList.get(i) <= 0) { // the list has invalid port, update with valid port
-      else if (clientPortList.get(i) <= 0) { // the list has invalid port, update with valid port
         clientPortList.remove(i);
         clientPortList.add(i, currentClientPort);
       }
@@ -403,13 +401,10 @@ public class MiniZooKeeperCluster {
     long start = System.currentTimeMillis();
     while (true) {
       try {
-        Socket sock = new Socket("localhost", port);
+        try (Socket sock = new Socket("localhost", port)) {
-        try {
           OutputStream outstream = sock.getOutputStream();
           outstream.write("stat".getBytes());
           outstream.flush();
-        } finally {
-          sock.close();
         }
       } catch (IOException e) {
         return true;

hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java

@@ -79,9 +79,9 @@ public class RecoverableZooKeeper {
   // An identifier of this process in the cluster
   private final String identifier;
   private final byte[] id;
-  private Watcher watcher;
+  private final Watcher watcher;
-  private int sessionTimeout;
+  private final int sessionTimeout;
-  private String quorumServers;
+  private final String quorumServers;
 
   public RecoverableZooKeeper(String quorumServers, int sessionTimeout,
       Watcher watcher, int maxRetries, int retryIntervalMillis, int maxSleepTime)

hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKAclReset.java

@@ -67,13 +67,10 @@ public class ZKAclReset extends Configured implements Tool {
 
   private static void resetAcls(final Configuration conf, boolean eraseAcls)
       throws Exception {
-    ZKWatcher zkw = new ZKWatcher(conf, "ZKAclReset", null);
+    try (ZKWatcher zkw = new ZKWatcher(conf, "ZKAclReset", null)) {
-    try {
       LOG.info((eraseAcls ? "Erase" : "Set") + " HBase ACLs for " +
-                zkw.getQuorum() + " " + zkw.getZNodePaths().baseZNode);
+              zkw.getQuorum() + " " + zkw.getZNodePaths().baseZNode);
       resetAcls(zkw, zkw.getZNodePaths().baseZNode, eraseAcls);
-    } finally {
-      zkw.close();
     }
   }
 
@@ -96,13 +93,20 @@ public class ZKAclReset extends Configured implements Tool {
   public int run(String[] args) throws Exception {
     boolean eraseAcls = true;
 
-    for (int i = 0; i < args.length; ++i) {
+    for (String arg : args) {
-      if (args[i].equals("-help")) {
+      switch (arg) {
-        printUsageAndExit();
+        case "-help": {
-      } else if (args[i].equals("-set-acls")) {
+          printUsageAndExit();
-        eraseAcls = false;
+          break;
-      } else {
+        }
-        printUsageAndExit();
+        case "-set-acls": {
+          eraseAcls = false;
+          break;
+        }
+        default: {
+          printUsageAndExit();
+          break;
+        }
       }
     }
 

hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKClusterId.java

@@ -35,8 +35,8 @@ import org.apache.zookeeper.KeeperException;
  */
 @InterfaceAudience.Private
 public class ZKClusterId {
-  private ZKWatcher watcher;
+  private final ZKWatcher watcher;
-  private Abortable abortable;
+  private final Abortable abortable;
   private String id;
 
   public ZKClusterId(ZKWatcher watcher, Abortable abortable) {

hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKLeaderManager.java

@@ -45,9 +45,9 @@ public class ZKLeaderManager extends ZKListener {
 
   private final Object lock = new Object();
   private final AtomicBoolean leaderExists = new AtomicBoolean();
-  private String leaderZNode;
+  private final String leaderZNode;
-  private byte[] nodeId;
+  private final byte[] nodeId;
-  private Stoppable candidate;
+  private final Stoppable candidate;
 
   public ZKLeaderManager(ZKWatcher watcher, String leaderZNode,
                          byte[] identifier, Stoppable candidate) {

hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java

@@ -244,7 +244,7 @@ public final class ZKUtil {
     private static final Map<String, String> BASIC_JAAS_OPTIONS = new HashMap<>();
     static {
       String jaasEnvVar = System.getenv("HBASE_JAAS_DEBUG");
-      if (jaasEnvVar != null && "true".equalsIgnoreCase(jaasEnvVar)) {
+      if ("true".equalsIgnoreCase(jaasEnvVar)) {
         BASIC_JAAS_OPTIONS.put("debug", "true");
       }
     }
@@ -351,7 +351,7 @@ public final class ZKUtil {
     throws KeeperException {
     try {
       Stat s = zkw.getRecoverableZooKeeper().exists(znode, zkw);
-      boolean exists = s != null ? true : false;
+      boolean exists = s != null;
       if (exists) {
         LOG.debug(zkw.prefix("Set watcher on existing znode=" + znode));
       } else {
@@ -441,8 +441,7 @@ public final class ZKUtil {
           ZKWatcher zkw, String znode)
     throws KeeperException {
     try {
-      List<String> children = zkw.getRecoverableZooKeeper().getChildren(znode, zkw);
+      return zkw.getRecoverableZooKeeper().getChildren(znode, zkw);
-      return children;
     } catch(KeeperException.NoNodeException ke) {
       LOG.debug(zkw.prefix("Unable to list children of znode " + znode + " " +
           "because node does not exist (not an error)"));
@@ -1744,9 +1743,12 @@ public final class ZKUtil {
         sb.append("<<FAILED LOOKUP: " + e.getMessage() + ">>");
       }
       sb.append("\nBackup master addresses:");
-      for (String child : listChildrenNoWatch(zkw,
+      final List<String> backupMasterChildrenNoWatchList = listChildrenNoWatch(zkw,
-              zkw.getZNodePaths().backupMasterAddressesZNode)) {
+              zkw.getZNodePaths().backupMasterAddressesZNode);
-        sb.append("\n ").append(child);
+      if (backupMasterChildrenNoWatchList != null) {
+        for (String child : backupMasterChildrenNoWatchList) {
+          sb.append("\n ").append(child);
+        }
       }
       sb.append("\nRegion server holding hbase:meta: "
         + new MetaTableLocator().getMetaRegionLocation(zkw));
@@ -1758,8 +1760,12 @@ public final class ZKUtil {
                     + new MetaTableLocator().getMetaRegionLocation(zkw, i));
       }
       sb.append("\nRegion servers:");
-      for (String child : listChildrenNoWatch(zkw, zkw.getZNodePaths().rsZNode)) {
+      final List<String> rsChildrenNoWatchList =
-        sb.append("\n ").append(child);
+              listChildrenNoWatch(zkw, zkw.getZNodePaths().rsZNode);
+      if (rsChildrenNoWatchList != null) {
+        for (String child : rsChildrenNoWatchList) {
+          sb.append("\n ").append(child);
+        }
       }
       try {
         getReplicationZnodesDump(zkw, sb);
@@ -1810,31 +1816,33 @@ public final class ZKUtil {
     // do a ls -r on this znode
     sb.append("\n").append(replicationZnode).append(": ");
     List<String> children = ZKUtil.listChildrenNoWatch(zkw, replicationZnode);
-    Collections.sort(children);
+    if (children != null) {
-    for (String child : children) {
+      Collections.sort(children);
-      String znode = ZNodePaths.joinZNode(replicationZnode, child);
+      for (String child : children) {
-      if (znode.equals(zkw.getZNodePaths().peersZNode)) {
+        String zNode = ZNodePaths.joinZNode(replicationZnode, child);
-        appendPeersZnodes(zkw, znode, sb);
+        if (zNode.equals(zkw.getZNodePaths().peersZNode)) {
-      } else if (znode.equals(zkw.getZNodePaths().queuesZNode)) {
+          appendPeersZnodes(zkw, zNode, sb);
-        appendRSZnodes(zkw, znode, sb);
+        } else if (zNode.equals(zkw.getZNodePaths().queuesZNode)) {
-      } else if (znode.equals(zkw.getZNodePaths().hfileRefsZNode)) {
+          appendRSZnodes(zkw, zNode, sb);
-        appendHFileRefsZnodes(zkw, znode, sb);
+        } else if (zNode.equals(zkw.getZNodePaths().hfileRefsZNode)) {
+          appendHFileRefsZNodes(zkw, zNode, sb);
+        }
       }
     }
   }
 
-  private static void appendHFileRefsZnodes(ZKWatcher zkw, String hfileRefsZnode,
+  private static void appendHFileRefsZNodes(ZKWatcher zkw, String hFileRefsZNode,
                                             StringBuilder sb) throws KeeperException {
-    sb.append("\n").append(hfileRefsZnode).append(": ");
+    sb.append("\n").append(hFileRefsZNode).append(": ");
-    for (String peerIdZnode : ZKUtil.listChildrenNoWatch(zkw, hfileRefsZnode)) {
+    final List<String> hFileRefChildrenNoWatchList =
-      String znodeToProcess = ZNodePaths.joinZNode(hfileRefsZnode, peerIdZnode);
+            ZKUtil.listChildrenNoWatch(zkw, hFileRefsZNode);
-      sb.append("\n").append(znodeToProcess).append(": ");
+    if (hFileRefChildrenNoWatchList != null) {
-      List<String> peerHFileRefsZnodes = ZKUtil.listChildrenNoWatch(zkw, znodeToProcess);
+      for (String peerIdZNode : hFileRefChildrenNoWatchList) {
-      int size = peerHFileRefsZnodes.size();
+        String zNodeToProcess = ZNodePaths.joinZNode(hFileRefsZNode, peerIdZNode);
-      for (int i = 0; i < size; i++) {
+        sb.append("\n").append(zNodeToProcess).append(": ");
-        sb.append(peerHFileRefsZnodes.get(i));
+        List<String> peerHFileRefsZNodes = ZKUtil.listChildrenNoWatch(zkw, zNodeToProcess);
-        if (i != size - 1) {
+        if (peerHFileRefsZNodes != null) {
-          sb.append(", ");
+          sb.append(String.join(", ", peerHFileRefsZNodes));
         }
       }
     }
@@ -1946,10 +1954,10 @@ public final class ZKUtil {
    * @return The array of response strings.
    * @throws IOException When the socket communication fails.
    */
-  public static String[] getServerStats(String server, int timeout)
+  private static String[] getServerStats(String server, int timeout)
     throws IOException {
     String[] sp = server.split(":");
-    if (sp == null || sp.length == 0) {
+    if (sp.length == 0) {
       return null;
     }
 
@@ -2085,7 +2093,7 @@ public final class ZKUtil {
    * @see #logZKTree(ZKWatcher, String)
    * @throws KeeperException if an unexpected exception occurs
    */
-  protected static void logZKTree(ZKWatcher zkw, String root, String prefix)
+  private static void logZKTree(ZKWatcher zkw, String root, String prefix)
       throws KeeperException {
     List<String> children = ZKUtil.listChildrenNoWatch(zkw, root);