Author: jgray
Date: Thu Sep 30 18:22:28 2010
New Revision: 1003196
URL: http://svn.apache.org/viewvc?rev=1003196&view=rev
Log:
HBASE-3056 Fix ordering in ZKWatcher constructor to prevent weird race
condition
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
Modified: hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1003196&r1=1003195&r2=1003196&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Thu Sep 30 18:22:28 2010
@@ -554,6 +554,8 @@ Release 0.21.0 - Unreleased
(Nicolas Spiegelberg via Stack)
HBASE-3047 If new master crashes, restart is messy
HBASE-3054 Remore TestEmptyMetaInfo; it doesn't make sense any more.
+ HBASE-3056 Fix ordering in ZKWatcher constructor to prevent weird race
+ condition
IMPROVEMENTS
HBASE-1760 Cleanup TODOs in HTable
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java?rev=1003196&r1=1003195&r2=1003196&view=diff
==============================================================================
---
hbase/trunk/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
(original)
+++
hbase/trunk/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
Thu Sep 30 18:22:28 2010
@@ -95,12 +95,12 @@ public class ZooKeeperWatcher implements
Abortable abortable)
throws IOException {
this.quorum = ZKConfig.getZKQuorumServersString(conf);
- this.zooKeeper = ZKUtil.connect(conf, quorum, this, descriptor);
// Identifier will get the sessionid appended later below down when we
// handle the syncconnect event.
this.identifier = descriptor;
this.abortable = abortable;
setNodeNames(conf);
+ this.zooKeeper = ZKUtil.connect(conf, quorum, this, descriptor);
try {
// Create all the necessary "directories" of znodes
// TODO: Move this to an init method somewhere so not everyone calls it?
