http://git-wip-us.apache.org/repos/asf/hbase/blob/1b98a96c/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/MasterAddressTracker.java ---------------------------------------------------------------------- diff --git a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/MasterAddressTracker.java b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/MasterAddressTracker.java index 18b81f4..915244e 100644 --- a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/MasterAddressTracker.java +++ b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/MasterAddressTracker.java @@ -65,7 +65,7 @@ public class MasterAddressTracker extends ZKNodeTracker { * @param abortable abortable in case of fatal error */ public MasterAddressTracker(ZKWatcher watcher, Abortable abortable) { - super(watcher, watcher.znodePaths.masterAddressZNode, abortable); + super(watcher, watcher.getZNodePaths().masterAddressZNode, abortable); } /** @@ -101,7 +101,7 @@ public class MasterAddressTracker extends ZKNodeTracker { * @return info port or 0 if timed out or exceptions */ public int getBackupMasterInfoPort(final ServerName sn) { - String backupZNode = ZNodePaths.joinZNode(watcher.znodePaths.backupMasterAddressesZNode, + String backupZNode = ZNodePaths.joinZNode(watcher.getZNodePaths().backupMasterAddressesZNode, sn.toString()); try { byte[] data = ZKUtil.getData(watcher, backupZNode); @@ -147,7 +147,7 @@ public class MasterAddressTracker extends ZKNodeTracker { throws KeeperException, IOException { byte [] data; try { - data = ZKUtil.getData(zkw, zkw.znodePaths.masterAddressZNode); + data = ZKUtil.getData(zkw, zkw.getZNodePaths().masterAddressZNode); } catch (InterruptedException e) { throw new InterruptedIOException(); } @@ -178,7 +178,7 @@ public class MasterAddressTracker extends ZKNodeTracker { public static int getMasterInfoPort(final ZKWatcher zkw) throws KeeperException, IOException { byte[] data; try { - data = ZKUtil.getData(zkw, zkw.znodePaths.masterAddressZNode); + data = ZKUtil.getData(zkw, zkw.getZNodePaths().masterAddressZNode); } catch (InterruptedException e) { throw new InterruptedIOException(); } @@ -208,7 +208,7 @@ public class MasterAddressTracker extends ZKNodeTracker { */ public static boolean setMasterAddress(final ZKWatcher zkw, final String znode, final ServerName master, int infoPort) - throws KeeperException { + throws KeeperException { return ZKUtil.createEphemeralNodeAndWatch(zkw, znode, toByteArray(master, infoPort)); } @@ -265,10 +265,10 @@ public class MasterAddressTracker extends ZKNodeTracker { try { Stat stat = new Stat(); - byte[] data = ZKUtil.getDataNoWatch(zkw, zkw.znodePaths.masterAddressZNode, stat); + byte[] data = ZKUtil.getDataNoWatch(zkw, zkw.getZNodePaths().masterAddressZNode, stat); ServerName sn = ProtobufUtil.parseServerNameFrom(data); if (sn != null && content.equals(sn.toString())) { - return (ZKUtil.deleteNode(zkw, zkw.znodePaths.masterAddressZNode, stat.getVersion())); + return (ZKUtil.deleteNode(zkw, zkw.getZNodePaths().masterAddressZNode, stat.getVersion())); } } catch (KeeperException e) { LOG.warn("Can't get or delete the master znode", e);
http://git-wip-us.apache.org/repos/asf/hbase/blob/1b98a96c/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/MasterMaintenanceModeTracker.java ---------------------------------------------------------------------- diff --git a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/MasterMaintenanceModeTracker.java b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/MasterMaintenanceModeTracker.java index 952da6f..9dafe5f 100644 --- a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/MasterMaintenanceModeTracker.java +++ b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/MasterMaintenanceModeTracker.java @@ -40,7 +40,7 @@ public class MasterMaintenanceModeTracker extends ZKListener { } private void update(String path) { - if (path.startsWith(watcher.znodePaths.masterMaintZNode)) { + if (path.startsWith(watcher.getZNodePaths().masterMaintZNode)) { update(); } } @@ -48,7 +48,8 @@ public class MasterMaintenanceModeTracker extends ZKListener { private void update() { try { List<String> children = - ZKUtil.listChildrenAndWatchForNewChildren(watcher, watcher.znodePaths.masterMaintZNode); + ZKUtil.listChildrenAndWatchForNewChildren(watcher, + watcher.getZNodePaths().masterMaintZNode); hasChildren = (children != null && children.size() > 0); } catch (KeeperException e) { // Ignore the ZK keeper exception http://git-wip-us.apache.org/repos/asf/hbase/blob/1b98a96c/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/MetaTableLocator.java ---------------------------------------------------------------------- diff --git a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/MetaTableLocator.java b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/MetaTableLocator.java index 76c12d0..7f0fb11 100644 --- a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/MetaTableLocator.java +++ b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/MetaTableLocator.java @@ -191,7 +191,7 @@ public class MetaTableLocator { * @throws NotAllMetaRegionsOnlineException if a meta or root region is not online */ public ServerName waitMetaRegionLocation(ZKWatcher zkw, long timeout) - throws InterruptedException, NotAllMetaRegionsOnlineException { + throws InterruptedException, NotAllMetaRegionsOnlineException { return waitMetaRegionLocation(zkw, RegionInfo.DEFAULT_REPLICA_ID, timeout); } @@ -209,9 +209,9 @@ public class MetaTableLocator { * @throws NotAllMetaRegionsOnlineException if a meta or root region is not online */ public ServerName waitMetaRegionLocation(ZKWatcher zkw, int replicaId, long timeout) - throws InterruptedException, NotAllMetaRegionsOnlineException { + throws InterruptedException, NotAllMetaRegionsOnlineException { try { - if (ZKUtil.checkExists(zkw, zkw.znodePaths.baseZNode) == -1) { + if (ZKUtil.checkExists(zkw, zkw.getZNodePaths().baseZNode) == -1) { String errorMsg = "Check the value configured in 'zookeeper.znode.parent'. " + "There could be a mismatch with the one configured in the master."; LOG.error(errorMsg); @@ -388,7 +388,7 @@ public class MetaTableLocator { service = connection.getAdmin(sn); } catch (RetriesExhaustedException e) { if (e.getCause() != null && e.getCause() instanceof ConnectException) { - // Catch this; presume it means the cached connection has gone bad. + LOG.debug("Catch this; presume it means the cached connection has gone bad."); } else { throw e; } @@ -407,12 +407,12 @@ public class MetaTableLocator { } catch (IOException ioe) { Throwable cause = ioe.getCause(); if (ioe instanceof ConnectException) { - // Catch. Connect refused. + LOG.debug("Catch. Connect refused."); } else if (cause != null && cause instanceof EOFException) { - // Catch. Other end disconnected us. + LOG.debug("Catch. Other end disconnected us."); } else if (cause != null && cause.getMessage() != null && cause.getMessage().toLowerCase(Locale.ROOT).contains("connection reset")) { - // Catch. Connection reset. + LOG.debug("Catch. Connection reset."); } else { throw ioe; } @@ -460,7 +460,7 @@ public class MetaTableLocator { byte[] data = ProtobufUtil.prependPBMagic(pbrsr.toByteArray()); try { ZKUtil.setData(zookeeper, - zookeeper.znodePaths.getZNodeForReplica(replicaId), data); + zookeeper.getZNodePaths().getZNodeForReplica(replicaId), data); } catch(KeeperException.NoNodeException nne) { if (replicaId == RegionInfo.DEFAULT_REPLICA_ID) { LOG.debug("META region location doesn't exist, create it"); @@ -468,7 +468,8 @@ public class MetaTableLocator { LOG.debug("META region location doesn't exist for replicaId=" + replicaId + ", create it"); } - ZKUtil.createAndWatch(zookeeper, zookeeper.znodePaths.getZNodeForReplica(replicaId), data); + ZKUtil.createAndWatch(zookeeper, zookeeper.getZNodePaths().getZNodeForReplica(replicaId), + data); } } @@ -492,7 +493,7 @@ public class MetaTableLocator { RegionState.State state = RegionState.State.OPEN; ServerName serverName = null; try { - byte[] data = ZKUtil.getData(zkw, zkw.znodePaths.getZNodeForReplica(replicaId)); + byte[] data = ZKUtil.getData(zkw, zkw.getZNodePaths().getZNodeForReplica(replicaId)); if (data != null && data.length > 0 && ProtobufUtil.isPBMagicPrefix(data)) { try { int prefixLen = ProtobufUtil.lengthOfPBMagic(); @@ -532,12 +533,12 @@ public class MetaTableLocator { * @throws KeeperException unexpected zookeeper exception */ public void deleteMetaLocation(ZKWatcher zookeeper) - throws KeeperException { + throws KeeperException { deleteMetaLocation(zookeeper, RegionInfo.DEFAULT_REPLICA_ID); } public void deleteMetaLocation(ZKWatcher zookeeper, int replicaId) - throws KeeperException { + throws KeeperException { if (replicaId == RegionInfo.DEFAULT_REPLICA_ID) { LOG.info("Deleting hbase:meta region location in ZooKeeper"); } else { @@ -545,7 +546,7 @@ public class MetaTableLocator { } try { // Just delete the node. Don't need any watches. - ZKUtil.deleteNode(zookeeper, zookeeper.znodePaths.getZNodeForReplica(replicaId)); + ZKUtil.deleteNode(zookeeper, zookeeper.getZNodePaths().getZNodeForReplica(replicaId)); } catch(KeeperException.NoNodeException nne) { // Has already been deleted } http://git-wip-us.apache.org/repos/asf/hbase/blob/1b98a96c/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java ---------------------------------------------------------------------- diff --git a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java index 9343ec2..c23e3d2 100644 --- a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java +++ b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java @@ -85,7 +85,7 @@ public class RecoverableZooKeeper { public RecoverableZooKeeper(String quorumServers, int sessionTimeout, Watcher watcher, int maxRetries, int retryIntervalMillis, int maxSleepTime) - throws IOException { + throws IOException { this(quorumServers, sessionTimeout, watcher, maxRetries, retryIntervalMillis, maxSleepTime, null); } @@ -94,7 +94,7 @@ public class RecoverableZooKeeper { justification="None. Its always been this way.") public RecoverableZooKeeper(String quorumServers, int sessionTimeout, Watcher watcher, int maxRetries, int retryIntervalMillis, int maxSleepTime, String identifier) - throws IOException { + throws IOException { // TODO: Add support for zk 'chroot'; we don't add it to the quorumServers String as we should. this.retryCounterFactory = new RetryCounterFactory(maxRetries+1, retryIntervalMillis, maxSleepTime); @@ -300,7 +300,7 @@ public class RecoverableZooKeeper { * @return List of children znodes */ public List<String> getChildren(String path, boolean watch) - throws KeeperException, InterruptedException { + throws KeeperException, InterruptedException { try (TraceScope scope = TraceUtil.createTrace("RecoverableZookeeper.getChildren")) { RetryCounter retryCounter = retryCounterFactory.create(); while (true) { @@ -331,7 +331,7 @@ public class RecoverableZooKeeper { * @return Data */ public byte[] getData(String path, Watcher watcher, Stat stat) - throws KeeperException, InterruptedException { + throws KeeperException, InterruptedException { try (TraceScope scope = TraceUtil.createTrace("RecoverableZookeeper.getData")) { RetryCounter retryCounter = retryCounterFactory.create(); while (true) { @@ -362,7 +362,7 @@ public class RecoverableZooKeeper { * @return Data */ public byte[] getData(String path, boolean watch, Stat stat) - throws KeeperException, InterruptedException { + throws KeeperException, InterruptedException { try (TraceScope scope = TraceUtil.createTrace("RecoverableZookeeper.getData")) { RetryCounter retryCounter = retryCounterFactory.create(); while (true) { @@ -395,7 +395,7 @@ public class RecoverableZooKeeper { * @return Stat instance */ public Stat setData(String path, byte[] data, int version) - throws KeeperException, InterruptedException { + throws KeeperException, InterruptedException { try (TraceScope scope = TraceUtil.createTrace("RecoverableZookeeper.setData")) { RetryCounter retryCounter = retryCounterFactory.create(); byte[] newData = ZKMetadata.appendMetaData(id, data); @@ -445,7 +445,7 @@ public class RecoverableZooKeeper { * @return list of ACLs */ public List<ACL> getAcl(String path, Stat stat) - throws KeeperException, InterruptedException { + throws KeeperException, InterruptedException { try (TraceScope scope = TraceUtil.createTrace("RecoverableZookeeper.getAcl")) { RetryCounter retryCounter = retryCounterFactory.create(); while (true) { @@ -476,7 +476,7 @@ public class RecoverableZooKeeper { * @return list of ACLs */ public Stat setAcl(String path, List<ACL> acls, int version) - throws KeeperException, InterruptedException { + throws KeeperException, InterruptedException { try (TraceScope scope = TraceUtil.createTrace("RecoverableZookeeper.setAcl")) { RetryCounter retryCounter = retryCounterFactory.create(); while (true) { @@ -519,7 +519,7 @@ public class RecoverableZooKeeper { */ public String create(String path, byte[] data, List<ACL> acl, CreateMode createMode) - throws KeeperException, InterruptedException { + throws KeeperException, InterruptedException { try (TraceScope scope = TraceUtil.createTrace("RecoverableZookeeper.create")) { byte[] newData = ZKMetadata.appendMetaData(id, data); switch (createMode) { @@ -587,7 +587,7 @@ public class RecoverableZooKeeper { private String createSequential(String path, byte[] data, List<ACL> acl, CreateMode createMode) - throws KeeperException, InterruptedException { + throws KeeperException, InterruptedException { RetryCounter retryCounter = retryCounterFactory.create(); boolean first = true; String newPath = path+this.identifier; @@ -653,7 +653,7 @@ public class RecoverableZooKeeper { * Run multiple operations in a transactional manner. Retry before throwing exception */ public List<OpResult> multi(Iterable<Op> ops) - throws KeeperException, InterruptedException { + throws KeeperException, InterruptedException { try (TraceScope scope = TraceUtil.createTrace("RecoverableZookeeper.multi")) { RetryCounter retryCounter = retryCounterFactory.create(); Iterable<Op> multiOps = prepareZKMulti(ops); http://git-wip-us.apache.org/repos/asf/hbase/blob/1b98a96c/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/RegionNormalizerTracker.java ---------------------------------------------------------------------- diff --git a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/RegionNormalizerTracker.java b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/RegionNormalizerTracker.java index 7413879..d69e750 100644 --- a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/RegionNormalizerTracker.java +++ b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/RegionNormalizerTracker.java @@ -38,7 +38,7 @@ public class RegionNormalizerTracker extends ZKNodeTracker { private static final Logger LOG = LoggerFactory.getLogger(RegionNormalizerTracker.class); public RegionNormalizerTracker(ZKWatcher watcher, Abortable abortable) { - super(watcher, watcher.znodePaths.regionNormalizerZNode, abortable); + super(watcher, watcher.getZNodePaths().regionNormalizerZNode, abortable); } /** @@ -65,11 +65,11 @@ public class RegionNormalizerTracker extends ZKNodeTracker { public void setNormalizerOn(boolean normalizerOn) throws KeeperException { byte [] upData = toByteArray(normalizerOn); try { - ZKUtil.setData(watcher, watcher.znodePaths.regionNormalizerZNode, upData); + ZKUtil.setData(watcher, watcher.getZNodePaths().regionNormalizerZNode, upData); } catch(KeeperException.NoNodeException nne) { - ZKUtil.createAndWatch(watcher, watcher.znodePaths.regionNormalizerZNode, upData); + ZKUtil.createAndWatch(watcher, watcher.getZNodePaths().regionNormalizerZNode, upData); } - super.nodeDataChanged(watcher.znodePaths.regionNormalizerZNode); + super.nodeDataChanged(watcher.getZNodePaths().regionNormalizerZNode); } private byte [] toByteArray(boolean isNormalizerOn) { http://git-wip-us.apache.org/repos/asf/hbase/blob/1b98a96c/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKAclReset.java ---------------------------------------------------------------------- diff --git a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKAclReset.java b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKAclReset.java index 50a6f5e..03a2846 100644 --- a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKAclReset.java +++ b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKAclReset.java @@ -70,8 +70,8 @@ public class ZKAclReset extends Configured implements Tool { ZKWatcher zkw = new ZKWatcher(conf, "ZKAclReset", null); try { LOG.info((eraseAcls ? "Erase" : "Set") + " HBase ACLs for " + - zkw.getQuorum() + " " + zkw.znodePaths.baseZNode); - resetAcls(zkw, zkw.znodePaths.baseZNode, eraseAcls); + zkw.getQuorum() + " " + zkw.getZNodePaths().baseZNode); + resetAcls(zkw, zkw.getZNodePaths().baseZNode, eraseAcls); } finally { zkw.close(); } http://git-wip-us.apache.org/repos/asf/hbase/blob/1b98a96c/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKClusterId.java ---------------------------------------------------------------------- diff --git a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKClusterId.java b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKClusterId.java index be2529b..a093f61 100644 --- a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKClusterId.java +++ b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKClusterId.java @@ -61,11 +61,11 @@ public class ZKClusterId { } public static String readClusterIdZNode(ZKWatcher watcher) - throws KeeperException { - if (ZKUtil.checkExists(watcher, watcher.znodePaths.clusterIdZNode) != -1) { + throws KeeperException { + if (ZKUtil.checkExists(watcher, watcher.getZNodePaths().clusterIdZNode) != -1) { byte [] data; try { - data = ZKUtil.getData(watcher, watcher.znodePaths.clusterIdZNode); + data = ZKUtil.getData(watcher, watcher.getZNodePaths().clusterIdZNode); } catch (InterruptedException e) { Thread.currentThread().interrupt(); return null; @@ -83,7 +83,7 @@ public class ZKClusterId { public static void setClusterId(ZKWatcher watcher, ClusterId id) throws KeeperException { - ZKUtil.createSetData(watcher, watcher.znodePaths.clusterIdZNode, id.toByteArray()); + ZKUtil.createSetData(watcher, watcher.getZNodePaths().clusterIdZNode, id.toByteArray()); } /** http://git-wip-us.apache.org/repos/asf/hbase/blob/1b98a96c/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKMainServer.java ---------------------------------------------------------------------- diff --git a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKMainServer.java b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKMainServer.java index 2488682..b2478ce 100644 --- a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKMainServer.java +++ b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKMainServer.java @@ -46,7 +46,7 @@ public class ZKMainServer { */ private static class HACK_UNTIL_ZOOKEEPER_1897_ZooKeeperMain extends ZooKeeperMain { public HACK_UNTIL_ZOOKEEPER_1897_ZooKeeperMain(String[] args) - throws IOException, InterruptedException { + throws IOException, InterruptedException { super(args); // Make sure we are connected before we proceed. Can take a while on some systems. If we // run the command without being connected, we get ConnectionLoss KeeperErrorConnection... @@ -57,9 +57,9 @@ public class ZKMainServer { /** * Run the command-line args passed. Calls System.exit when done. - * @throws KeeperException - * @throws IOException - * @throws InterruptedException + * @throws KeeperException if an unexpected ZooKeeper exception happens + * @throws IOException in case of a network failure + * @throws InterruptedException if the ZooKeeper client closes */ void runCmdLine() throws KeeperException, IOException, InterruptedException { processCmd(this.cl); http://git-wip-us.apache.org/repos/asf/hbase/blob/1b98a96c/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKNodeTracker.java ---------------------------------------------------------------------- diff --git a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKNodeTracker.java b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKNodeTracker.java index f76947b..5806e5b 100644 --- a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKNodeTracker.java +++ b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKNodeTracker.java @@ -102,7 +102,7 @@ public abstract class ZKNodeTracker extends ZKListener { * @throws InterruptedException if the waiting thread is interrupted */ public synchronized byte [] blockUntilAvailable() - throws InterruptedException { + throws InterruptedException { return blockUntilAvailable(0, false); } @@ -238,11 +238,11 @@ public abstract class ZKNodeTracker extends ZKListener { */ public boolean checkIfBaseNodeAvailable() { try { - if (ZKUtil.checkExists(watcher, watcher.znodePaths.baseZNode) == -1) { + if (ZKUtil.checkExists(watcher, watcher.getZNodePaths().baseZNode) == -1) { return false; } } catch (KeeperException e) { - abortable.abort("Exception while checking if basenode (" + watcher.znodePaths.baseZNode + abortable.abort("Exception while checking if basenode (" + watcher.getZNodePaths().baseZNode + ") exists in ZooKeeper.", e); } http://git-wip-us.apache.org/repos/asf/hbase/blob/1b98a96c/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKSplitLog.java ---------------------------------------------------------------------- diff --git a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKSplitLog.java b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKSplitLog.java index b58c98c..f933070 100644 --- a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKSplitLog.java +++ b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKSplitLog.java @@ -47,7 +47,7 @@ public final class ZKSplitLog { * @param filename log file name (only the basename) */ public static String getEncodedNodeName(ZKWatcher zkw, String filename) { - return ZNodePaths.joinZNode(zkw.znodePaths.splitLogZNode, encode(filename)); + return ZNodePaths.joinZNode(zkw.getZNodePaths().splitLogZNode, encode(filename)); } public static String getFileName(String node) { @@ -72,7 +72,7 @@ public final class ZKSplitLog { } public static String getRescanNode(ZKWatcher zkw) { - return ZNodePaths.joinZNode(zkw.znodePaths.splitLogZNode, "RESCAN"); + return ZNodePaths.joinZNode(zkw.getZNodePaths().splitLogZNode, "RESCAN"); } /** http://git-wip-us.apache.org/repos/asf/hbase/blob/1b98a96c/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java ---------------------------------------------------------------------- diff --git a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java index f1cacbf..9153191 100644 --- a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java +++ b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java @@ -108,20 +108,20 @@ public final class ZKUtil { * @throws IOException if unable to connect to zk or config problem */ public static RecoverableZooKeeper connect(Configuration conf, Watcher watcher) - throws IOException { + throws IOException { String ensemble = ZKConfig.getZKQuorumServersString(conf); return connect(conf, ensemble, watcher); } public static RecoverableZooKeeper connect(Configuration conf, String ensemble, Watcher watcher) - throws IOException { + throws IOException { return connect(conf, ensemble, watcher, null); } public static RecoverableZooKeeper connect(Configuration conf, String ensemble, Watcher watcher, final String identifier) - throws IOException { + throws IOException { if(ensemble == null) { throw new IOException("Unable to determine ZooKeeper ensemble"); } @@ -347,7 +347,7 @@ public final class ZKUtil { * @throws KeeperException if unexpected zookeeper exception */ public static boolean watchAndCheckExists(ZKWatcher zkw, String znode) - throws KeeperException { + throws KeeperException { try { Stat s = zkw.getRecoverableZooKeeper().exists(znode, zkw); boolean exists = s != null ? true : false; @@ -401,7 +401,7 @@ public final class ZKUtil { * @throws KeeperException if unexpected zookeeper exception */ public static int checkExists(ZKWatcher zkw, String znode) - throws KeeperException { + throws KeeperException { try { Stat s = zkw.getRecoverableZooKeeper().exists(znode, null); return s != null ? s.getVersion() : -1; @@ -438,7 +438,7 @@ public final class ZKUtil { */ public static List<String> listChildrenAndWatchForNewChildren( ZKWatcher zkw, String znode) - throws KeeperException { + throws KeeperException { try { List<String> children = zkw.getRecoverableZooKeeper().getChildren(znode, zkw); return children; @@ -493,7 +493,7 @@ public final class ZKUtil { * @throws KeeperException if unexpected zookeeper exception */ public static List<String> listChildrenNoWatch(ZKWatcher zkw, String znode) - throws KeeperException { + throws KeeperException { List<String> children = null; try { // List the children without watching @@ -550,7 +550,7 @@ public final class ZKUtil { * @throws KeeperException if unexpected zookeeper exception */ public static boolean nodeHasChildren(ZKWatcher zkw, String znode) - throws KeeperException { + throws KeeperException { try { return !zkw.getRecoverableZooKeeper().getChildren(znode, null).isEmpty(); } catch(KeeperException.NoNodeException ke) { @@ -582,7 +582,7 @@ public final class ZKUtil { * @throws KeeperException if unexpected zookeeper exception */ public static int getNumberOfChildren(ZKWatcher zkw, String znode) - throws KeeperException { + throws KeeperException { try { Stat stat = zkw.getRecoverableZooKeeper().exists(znode, null); return stat == null ? 0 : stat.getNumChildren(); @@ -633,7 +633,7 @@ public final class ZKUtil { * @throws KeeperException if unexpected zookeeper exception */ public static byte [] getDataAndWatch(ZKWatcher zkw, String znode) - throws KeeperException { + throws KeeperException { return getDataInternal(zkw, znode, null, true); } @@ -695,7 +695,7 @@ public final class ZKUtil { */ public static byte [] getDataNoWatch(ZKWatcher zkw, String znode, Stat stat) - throws KeeperException { + throws KeeperException { try { byte [] data = zkw.getRecoverableZooKeeper().getData(znode, null, stat); logRetrievedMsg(zkw, znode, data, false); @@ -801,7 +801,7 @@ public final class ZKUtil { */ public static boolean setData(ZKWatcher zkw, String znode, byte [] data, int expectedVersion) - throws KeeperException, KeeperException.NoNodeException { + throws KeeperException, KeeperException.NoNodeException { try { return zkw.getRecoverableZooKeeper().setData(znode, data, expectedVersion) != null; } catch (InterruptedException e) { @@ -845,12 +845,12 @@ public final class ZKUtil { * @throws KeeperException if unexpected zookeeper exception */ public static void setData(ZKWatcher zkw, String znode, byte [] data) - throws KeeperException, KeeperException.NoNodeException { + throws KeeperException, KeeperException.NoNodeException { setData(zkw, (SetData)ZKUtilOp.setData(znode, data)); } private static void setData(ZKWatcher zkw, SetData setData) - throws KeeperException, KeeperException.NoNodeException { + throws KeeperException, KeeperException.NoNodeException { SetDataRequest sd = (SetDataRequest)toZooKeeperOp(zkw, setData).toRequestRecord(); setData(zkw, sd.getPath(), sd.getData(), sd.getVersion()); } @@ -891,7 +891,7 @@ public final class ZKUtil { public static ArrayList<ACL> createACL(ZKWatcher zkw, String node, boolean isSecureZooKeeper) { - if (!node.startsWith(zkw.znodePaths.baseZNode)) { + if (!node.startsWith(zkw.getZNodePaths().baseZNode)) { return Ids.OPEN_ACL_UNSAFE; } if (isSecureZooKeeper) { @@ -923,7 +923,7 @@ public final class ZKUtil { } // Certain znodes are accessed directly by the client, // so they must be readable by non-authenticated clients - if (zkw.znodePaths.isClientReadable(node)) { + if (zkw.getZNodePaths().isClientReadable(node)) { acls.addAll(Ids.CREATOR_ALL_ACL); acls.addAll(Ids.READ_ACL_UNSAFE); } else { @@ -959,7 +959,7 @@ public final class ZKUtil { */ public static boolean createEphemeralNodeAndWatch(ZKWatcher zkw, String znode, byte [] data) - throws KeeperException { + throws KeeperException { boolean ret = true; try { zkw.getRecoverableZooKeeper().create(znode, data, createACL(zkw, znode), @@ -999,7 +999,7 @@ public final class ZKUtil { */ public static boolean createNodeIfNotExistsAndWatch( ZKWatcher zkw, String znode, byte [] data) - throws KeeperException { + throws KeeperException { boolean ret = true; try { zkw.getRecoverableZooKeeper().create(znode, data, createACL(zkw, znode), @@ -1066,7 +1066,7 @@ public final class ZKUtil { */ public static int createAndWatch(ZKWatcher zkw, String znode, byte [] data) - throws KeeperException, KeeperException.NodeExistsException { + throws KeeperException, KeeperException.NodeExistsException { try { zkw.getRecoverableZooKeeper().create(znode, data, createACL(zkw, znode), CreateMode.PERSISTENT); @@ -1132,13 +1132,13 @@ public final class ZKUtil { */ public static void createAndFailSilent(ZKWatcher zkw, String znode, byte[] data) - throws KeeperException { + throws KeeperException { createAndFailSilent(zkw, (CreateAndFailSilent)ZKUtilOp.createAndFailSilent(znode, data)); } private static void createAndFailSilent(ZKWatcher zkw, CreateAndFailSilent cafs) - throws KeeperException { + throws KeeperException { CreateRequest create = (CreateRequest)toZooKeeperOp(zkw, cafs).toRequestRecord(); String znode = create.getPath(); try { @@ -1173,7 +1173,7 @@ public final class ZKUtil { * @throws KeeperException if unexpected zookeeper exception */ public static void createWithParents(ZKWatcher zkw, String znode) - throws KeeperException { + throws KeeperException { createWithParents(zkw, znode, new byte[0]); } @@ -1191,7 +1191,7 @@ public final class ZKUtil { * @throws KeeperException if unexpected zookeeper exception */ public static void createWithParents(ZKWatcher zkw, String znode, byte[] data) - throws KeeperException { + throws KeeperException { try { if(znode == null) { return; @@ -1216,7 +1216,7 @@ public final class ZKUtil { * Delete the specified node. Sets no watches. Throws all exceptions. */ public static void deleteNode(ZKWatcher zkw, String node) - throws KeeperException { + throws KeeperException { deleteNode(zkw, node, -1); } @@ -1226,7 +1226,7 @@ public final class ZKUtil { */ public static boolean deleteNode(ZKWatcher zkw, String node, int version) - throws KeeperException { + throws KeeperException { try { zkw.getRecoverableZooKeeper().delete(node, version); return true; @@ -1246,7 +1246,7 @@ public final class ZKUtil { * @throws KeeperException if a ZooKeeper operation fails */ public static void deleteNodeFailSilent(ZKWatcher zkw, String node) - throws KeeperException { + throws KeeperException { deleteNodeFailSilent(zkw, (DeleteNodeFailSilent)ZKUtilOp.deleteNodeFailSilent(node)); } @@ -1272,7 +1272,7 @@ public final class ZKUtil { * children. */ public static void deleteNodeRecursively(ZKWatcher zkw, String node) - throws KeeperException { + throws KeeperException { deleteNodeRecursivelyMultiOrSequential(zkw, true, node); } @@ -1735,7 +1735,7 @@ public final class ZKUtil { public static String dump(ZKWatcher zkw) { StringBuilder sb = new StringBuilder(); try { - sb.append("HBase is rooted at ").append(zkw.znodePaths.baseZNode); + sb.append("HBase is rooted at ").append(zkw.getZNodePaths().baseZNode); sb.append("\nActive master address: "); try { sb.append(MasterAddressTracker.getMasterAddress(zkw)); @@ -1743,7 +1743,8 @@ public final class ZKUtil { sb.append("<<FAILED LOOKUP: " + e.getMessage() + ">>"); } sb.append("\nBackup master addresses:"); - for (String child : listChildrenNoWatch(zkw, zkw.znodePaths.backupMasterAddressesZNode)) { + for (String child : listChildrenNoWatch(zkw, + zkw.getZNodePaths().backupMasterAddressesZNode)) { sb.append("\n ").append(child); } sb.append("\nRegion server holding hbase:meta: " @@ -1756,7 +1757,7 @@ public final class ZKUtil { + new MetaTableLocator().getMetaRegionLocation(zkw, i)); } sb.append("\nRegion servers:"); - for (String child : listChildrenNoWatch(zkw, zkw.znodePaths.rsZNode)) { + for (String child : listChildrenNoWatch(zkw, zkw.getZNodePaths().rsZNode)) { sb.append("\n ").append(child); } try { @@ -1799,7 +1800,7 @@ public final class ZKUtil { */ private static void getReplicationZnodesDump(ZKWatcher zkw, StringBuilder sb) throws KeeperException { - String replicationZnode = zkw.znodePaths.replicationZNode; + String replicationZnode = zkw.getZNodePaths().replicationZNode; if (ZKUtil.checkExists(zkw, replicationZnode) == -1) { return; @@ -1810,11 +1811,11 @@ public final class ZKUtil { List<String> children = ZKUtil.listChildrenNoWatch(zkw, replicationZnode); for (String child : children) { String znode = ZNodePaths.joinZNode(replicationZnode, child); - if (znode.equals(zkw.znodePaths.peersZNode)) { + if (znode.equals(zkw.getZNodePaths().peersZNode)) { appendPeersZnodes(zkw, znode, sb); - } else if (znode.equals(zkw.znodePaths.queuesZNode)) { + } else if (znode.equals(zkw.getZNodePaths().queuesZNode)) { appendRSZnodes(zkw, znode, sb); - } else if (znode.equals(zkw.znodePaths.hfileRefsZNode)) { + } else if (znode.equals(zkw.getZNodePaths().hfileRefsZNode)) { appendHFileRefsZnodes(zkw, znode, sb); } } @@ -1944,7 +1945,7 @@ public final class ZKUtil { * @throws IOException When the socket communication fails. */ public static String[] getServerStats(String server, int timeout) - throws IOException { + throws IOException { String[] sp = server.split(":"); if (sp == null || sp.length == 0) { return null; @@ -1989,9 +1990,9 @@ public final class ZKUtil { " byte(s) of data from znode " + znode + (watcherSet? " and set watcher; ": "; data=") + (data == null? "null": data.length == 0? "empty": ( - znode.startsWith(zkw.znodePaths.metaZNodePrefix)? + znode.startsWith(zkw.getZNodePaths().metaZNodePrefix)? getServerNameOrEmptyString(data): - znode.startsWith(zkw.znodePaths.backupMasterAddressesZNode)? + znode.startsWith(zkw.getZNodePaths().backupMasterAddressesZNode)? getServerNameOrEmptyString(data): StringUtils.abbreviate(Bytes.toStringBinary(data), 32))))); } http://git-wip-us.apache.org/repos/asf/hbase/blob/1b98a96c/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKWatcher.java ---------------------------------------------------------------------- diff --git a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKWatcher.java b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKWatcher.java index c3cac5f..cceedfd 100644 --- a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKWatcher.java +++ b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKWatcher.java @@ -76,14 +76,14 @@ public class ZKWatcher implements Watcher, Abortable, Closeable { // Used if abortable is null private boolean aborted = false; - public final ZNodePaths znodePaths; + private final ZNodePaths znodePaths; // listeners to be notified private final List<ZKListener> listeners = new CopyOnWriteArrayList<>(); // Used by ZKUtil:waitForZKConnectionIfAuthenticating to wait for SASL // negotiation to complete - public CountDownLatch saslLatch = new CountDownLatch(1); + private CountDownLatch saslLatch = new CountDownLatch(1); private final Configuration conf; @@ -95,7 +95,7 @@ public class ZKWatcher implements Watcher, Abortable, Closeable { * @param identifier string that is passed to RecoverableZookeeper to be used as * identifier for this instance. Use null for default. * @throws IOException if the connection to ZooKeeper fails - * @throws ZooKeeperConnectionException + * @throws ZooKeeperConnectionException if the client can't connect to ZooKeeper */ public ZKWatcher(Configuration conf, String identifier, Abortable abortable) throws ZooKeeperConnectionException, IOException { @@ -111,11 +111,11 @@ public class ZKWatcher implements Watcher, Abortable, Closeable { * context. * @param canCreateBaseZNode true if a base ZNode can be created * @throws IOException if the connection to ZooKeeper fails - * @throws ZooKeeperConnectionException + * @throws ZooKeeperConnectionException if the client can't connect to ZooKeeper */ public ZKWatcher(Configuration conf, String identifier, Abortable abortable, boolean canCreateBaseZNode) - throws IOException, ZooKeeperConnectionException { + throws IOException, ZooKeeperConnectionException { this(conf, identifier, abortable, canCreateBaseZNode, false); } @@ -517,6 +517,8 @@ public class ZKWatcher implements Watcher, Abortable, Closeable { } break; } + default: + throw new IllegalStateException("Received event is not valid: " + event.getState()); } } http://git-wip-us.apache.org/repos/asf/hbase/blob/1b98a96c/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKLeaderManager.java ---------------------------------------------------------------------- diff --git a/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKLeaderManager.java b/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKLeaderManager.java index 8371f91..432779e 100644 --- a/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKLeaderManager.java +++ b/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKLeaderManager.java @@ -18,7 +18,6 @@ package org.apache.hadoop.hbase.zookeeper; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; http://git-wip-us.apache.org/repos/asf/hbase/blob/1b98a96c/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKMainServer.java ---------------------------------------------------------------------- diff --git a/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKMainServer.java b/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKMainServer.java index f805260..d1c18d3 100644 --- a/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKMainServer.java +++ b/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKMainServer.java @@ -43,7 +43,7 @@ public class TestZKMainServer { // http://stackoverflow.com/questions/309396/java-how-to-test-methods-that-call-system-exit protected static class ExitException extends SecurityException { private static final long serialVersionUID = 1L; - public final int status; + private final int status; public ExitException(int status) { super("There is no escape!"); this.status = status; http://git-wip-us.apache.org/repos/asf/hbase/blob/1b98a96c/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKMulti.java ---------------------------------------------------------------------- diff --git a/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKMulti.java b/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKMulti.java index 55e7aa8..0f2472b 100644 --- a/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKMulti.java +++ b/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKMulti.java @@ -90,7 +90,7 @@ public class TestZKMulti { ZKUtil.multiOrSequential(zkw, new LinkedList<>(), false); // single create - String path = ZNodePaths.joinZNode(zkw.znodePaths.baseZNode, "testSimpleMulti"); + String path = ZNodePaths.joinZNode(zkw.getZNodePaths().baseZNode, "testSimpleMulti"); LinkedList<ZKUtilOp> singleCreate = new LinkedList<>(); singleCreate.add(ZKUtilOp.createAndFailSilent(path, new byte[0])); ZKUtil.multiOrSequential(zkw, singleCreate, false); @@ -112,12 +112,12 @@ public class TestZKMulti { @Test public void testComplexMulti() throws Exception { - String path1 = ZNodePaths.joinZNode(zkw.znodePaths.baseZNode, "testComplexMulti1"); - String path2 = ZNodePaths.joinZNode(zkw.znodePaths.baseZNode, "testComplexMulti2"); - String path3 = ZNodePaths.joinZNode(zkw.znodePaths.baseZNode, "testComplexMulti3"); - String path4 = ZNodePaths.joinZNode(zkw.znodePaths.baseZNode, "testComplexMulti4"); - String path5 = ZNodePaths.joinZNode(zkw.znodePaths.baseZNode, "testComplexMulti5"); - String path6 = ZNodePaths.joinZNode(zkw.znodePaths.baseZNode, "testComplexMulti6"); + String path1 = ZNodePaths.joinZNode(zkw.getZNodePaths().baseZNode, "testComplexMulti1"); + String path2 = ZNodePaths.joinZNode(zkw.getZNodePaths().baseZNode, "testComplexMulti2"); + String path3 = ZNodePaths.joinZNode(zkw.getZNodePaths().baseZNode, "testComplexMulti3"); + String path4 = ZNodePaths.joinZNode(zkw.getZNodePaths().baseZNode, "testComplexMulti4"); + String path5 = ZNodePaths.joinZNode(zkw.getZNodePaths().baseZNode, "testComplexMulti5"); + String path6 = ZNodePaths.joinZNode(zkw.getZNodePaths().baseZNode, "testComplexMulti6"); // create 4 nodes that we'll setData on or delete later LinkedList<ZKUtilOp> create4Nodes = new LinkedList<>(); create4Nodes.add(ZKUtilOp.createAndFailSilent(path1, Bytes.toBytes(path1))); @@ -156,7 +156,7 @@ public class TestZKMulti { public void testSingleFailure() throws Exception { // try to delete a node that doesn't exist boolean caughtNoNode = false; - String path = ZNodePaths.joinZNode(zkw.znodePaths.baseZNode, "testSingleFailureZ"); + String path = ZNodePaths.joinZNode(zkw.getZNodePaths().baseZNode, "testSingleFailureZ"); LinkedList<ZKUtilOp> ops = new LinkedList<>(); ops.add(ZKUtilOp.deleteNodeFailSilent(path)); try { @@ -193,9 +193,9 @@ public class TestZKMulti { @Test public void testSingleFailureInMulti() throws Exception { // try a multi where all but one operation succeeds - String pathA = ZNodePaths.joinZNode(zkw.znodePaths.baseZNode, "testSingleFailureInMultiA"); - String pathB = ZNodePaths.joinZNode(zkw.znodePaths.baseZNode, "testSingleFailureInMultiB"); - String pathC = ZNodePaths.joinZNode(zkw.znodePaths.baseZNode, "testSingleFailureInMultiC"); + String pathA = ZNodePaths.joinZNode(zkw.getZNodePaths().baseZNode, "testSingleFailureInMultiA"); + String pathB = ZNodePaths.joinZNode(zkw.getZNodePaths().baseZNode, "testSingleFailureInMultiB"); + String pathC = ZNodePaths.joinZNode(zkw.getZNodePaths().baseZNode, "testSingleFailureInMultiC"); LinkedList<ZKUtilOp> ops = new LinkedList<>(); ops.add(ZKUtilOp.createAndFailSilent(pathA, Bytes.toBytes(pathA))); ops.add(ZKUtilOp.createAndFailSilent(pathB, Bytes.toBytes(pathB))); @@ -215,17 +215,17 @@ public class TestZKMulti { @Test public void testMultiFailure() throws Exception { - String pathX = ZNodePaths.joinZNode(zkw.znodePaths.baseZNode, "testMultiFailureX"); - String pathY = ZNodePaths.joinZNode(zkw.znodePaths.baseZNode, "testMultiFailureY"); - String pathZ = ZNodePaths.joinZNode(zkw.znodePaths.baseZNode, "testMultiFailureZ"); + String pathX = ZNodePaths.joinZNode(zkw.getZNodePaths().baseZNode, "testMultiFailureX"); + String pathY = ZNodePaths.joinZNode(zkw.getZNodePaths().baseZNode, "testMultiFailureY"); + String pathZ = ZNodePaths.joinZNode(zkw.getZNodePaths().baseZNode, "testMultiFailureZ"); // create X that we will use to fail create later LinkedList<ZKUtilOp> ops = new LinkedList<>(); ops.add(ZKUtilOp.createAndFailSilent(pathX, Bytes.toBytes(pathX))); ZKUtil.multiOrSequential(zkw, ops, false); // fail one of each create ,setData, delete - String pathV = ZNodePaths.joinZNode(zkw.znodePaths.baseZNode, "testMultiFailureV"); - String pathW = ZNodePaths.joinZNode(zkw.znodePaths.baseZNode, "testMultiFailureW"); + String pathV = ZNodePaths.joinZNode(zkw.getZNodePaths().baseZNode, "testMultiFailureV"); + String pathW = ZNodePaths.joinZNode(zkw.getZNodePaths().baseZNode, "testMultiFailureW"); ops = new LinkedList<>(); ops.add(ZKUtilOp.createAndFailSilent(pathX, Bytes.toBytes(pathX))); // fail -- already exists ops.add(ZKUtilOp.setData(pathY, Bytes.toBytes(pathY))); // fail -- doesn't exist @@ -269,10 +269,10 @@ public class TestZKMulti { @Test public void testRunSequentialOnMultiFailure() throws Exception { - String path1 = ZNodePaths.joinZNode(zkw.znodePaths.baseZNode, "runSequential1"); - String path2 = ZNodePaths.joinZNode(zkw.znodePaths.baseZNode, "runSequential2"); - String path3 = ZNodePaths.joinZNode(zkw.znodePaths.baseZNode, "runSequential3"); - String path4 = ZNodePaths.joinZNode(zkw.znodePaths.baseZNode, "runSequential4"); + String path1 = ZNodePaths.joinZNode(zkw.getZNodePaths().baseZNode, "runSequential1"); + String path2 = ZNodePaths.joinZNode(zkw.getZNodePaths().baseZNode, "runSequential2"); + String path3 = ZNodePaths.joinZNode(zkw.getZNodePaths().baseZNode, "runSequential3"); + String path4 = ZNodePaths.joinZNode(zkw.getZNodePaths().baseZNode, "runSequential4"); // create some nodes that we will use later LinkedList<ZKUtilOp> ops = new LinkedList<>(); http://git-wip-us.apache.org/repos/asf/hbase/blob/1b98a96c/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKNodeTracker.java ---------------------------------------------------------------------- diff --git a/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKNodeTracker.java b/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKNodeTracker.java index 9e90177..8b059bc 100644 --- a/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKNodeTracker.java +++ b/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKNodeTracker.java @@ -99,9 +99,9 @@ public class TestZKNodeTracker { Abortable abortable = new StubAbortable(); ZKWatcher zk = new ZKWatcher(TEST_UTIL.getConfiguration(), "testNodeTracker", abortable); - ZKUtil.createAndFailSilent(zk, zk.znodePaths.baseZNode); + ZKUtil.createAndFailSilent(zk, zk.getZNodePaths().baseZNode); - final String node = ZNodePaths.joinZNode(zk.znodePaths.baseZNode, + final String node = ZNodePaths.joinZNode(zk.getZNodePaths().baseZNode, Long.toString(ThreadLocalRandom.current().nextLong())); final byte [] dataOne = Bytes.toBytes("dataOne"); @@ -322,7 +322,7 @@ public class TestZKNodeTracker { TEST_UTIL.getConfiguration().get(HConstants.ZOOKEEPER_ZNODE_PARENT, HConstants.DEFAULT_ZOOKEEPER_ZNODE_PARENT)); - final String nodeName = zkw.znodePaths.masterAddressZNode; + final String nodeName = zkw.getZNodePaths().masterAddressZNode; // Check that we manage the case when there is no data ZKUtil.createAndFailSilent(zkw, nodeName); http://git-wip-us.apache.org/repos/asf/hbase/blob/1b98a96c/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKUtilNoServer.java ---------------------------------------------------------------------- diff --git a/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKUtilNoServer.java b/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKUtilNoServer.java index 99ec35e..c8cc0eb 100644 --- a/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKUtilNoServer.java +++ b/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKUtilNoServer.java @@ -112,7 +112,7 @@ public class TestZKUtilNoServer { } }; Mockito.doThrow(new InterruptedException()).when(recoverableZk) - .getChildren(zkw.znodePaths.baseZNode, null); - ZKUtil.listChildrenNoWatch(zkw, zkw.znodePaths.baseZNode); + .getChildren(zkw.getZNodePaths().baseZNode, null); + ZKUtil.listChildrenNoWatch(zkw, zkw.getZNodePaths().baseZNode); } }
