You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2014/12/23 21:20:44 UTC
hbase git commit: HBASE-12739 Avoid too large identifier of
ZooKeeperWatcher (Liu Shaohui)
Repository: hbase
Updated Branches:
refs/heads/master 4880e5d83 -> 2b090d683
HBASE-12739 Avoid too large identifier of ZooKeeperWatcher (Liu Shaohui)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/2b090d68
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2b090d68
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2b090d68
Branch: refs/heads/master
Commit: 2b090d6832c944ea47f81e1b6db518a74c1149e0
Parents: 4880e5d
Author: stack <st...@apache.org>
Authored: Tue Dec 23 12:20:30 2014 -0800
Committer: stack <st...@apache.org>
Committed: Tue Dec 23 12:20:30 2014 -0800
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/2b090d68/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
----------------------------------------------------------------------
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 fb98035..84bd9f8 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
@@ -56,6 +56,7 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable {
// Identifier for this watcher (for logging only). It is made of the prefix
// passed on construction and the zookeeper sessionid.
+ private String prefix;
private String identifier;
// zookeeper quorum
@@ -154,9 +155,10 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable {
this.constructorCaller = e;
}
this.quorum = ZKConfig.getZKQuorumServersString(conf);
+ this.prefix = identifier;
// Identifier will get the sessionid appended later below down when we
// handle the syncconnect event.
- this.identifier = identifier;
+ this.identifier = identifier + "0x0";
this.abortable = abortable;
setNodeNames(conf);
this.recoverableZooKeeper = ZKUtil.connect(conf, quorum, this, identifier);
@@ -382,7 +384,7 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable {
this.constructorCaller);
throw new NullPointerException("ZK is null");
}
- this.identifier = this.identifier + "-0x" +
+ this.identifier = this.prefix + "-0x" +
Long.toHexString(this.recoverableZooKeeper.getSessionId());
// Update our identifier. Otherwise ignore.
LOG.debug(this.identifier + " connected");