Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-12739 Avoid too large identifier of ZooKeeperWatcher (Liu Shaohui)

This commit is contained in:
stack 2014-12-23 12:20:30 -08:00
parent 4880e5d83b
commit 2b090d6832
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
View File

@ -56,6 +56,7 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable {
// Identifier for this watcher (for logging only). It is made of the prefix // Identifier for this watcher (for logging only). It is made of the prefix
// passed on construction and the zookeeper sessionid. // passed on construction and the zookeeper sessionid.
private String prefix;
private String identifier; private String identifier;
// zookeeper quorum // zookeeper quorum
@ -154,9 +155,10 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable {
this.constructorCaller = e; this.constructorCaller = e;
} }
this.quorum = ZKConfig.getZKQuorumServersString(conf); this.quorum = ZKConfig.getZKQuorumServersString(conf);
this.prefix = identifier;
// Identifier will get the sessionid appended later below down when we // Identifier will get the sessionid appended later below down when we
// handle the syncconnect event. // handle the syncconnect event.
this.identifier = identifier; this.identifier = identifier + "0x0";
this.abortable = abortable; this.abortable = abortable;
setNodeNames(conf); setNodeNames(conf);
this.recoverableZooKeeper = ZKUtil.connect(conf, quorum, this, identifier); this.recoverableZooKeeper = ZKUtil.connect(conf, quorum, this, identifier);
@ -382,7 +384,7 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable {
this.constructorCaller); this.constructorCaller);
throw new NullPointerException("ZK is null"); throw new NullPointerException("ZK is null");
} }
this.identifier = this.identifier + "-0x" + this.identifier = this.prefix + "-0x" +
Long.toHexString(this.recoverableZooKeeper.getSessionId()); Long.toHexString(this.recoverableZooKeeper.getSessionId());
// Update our identifier. Otherwise ignore. // Update our identifier. Otherwise ignore.
LOG.debug(this.identifier + " connected"); LOG.debug(this.identifier + " connected");