You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@hbase.apache.org by te...@apache.org on 2012/04/16 23:45:35 UTC

svn commit: r1326810 - /hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.java

Author: tedyu
Date: Mon Apr 16 21:45:34 2012
New Revision: 1326810

URL: http://svn.apache.org/viewvc?rev=1326810&view=rev
Log:
HBASE-5780 Fix race in HBase regionserver startup vs ZK SASL authentication (Shaneal)

Modified:
    hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.java

Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.java?rev=1326810&r1=1326809&r2=1326810&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.java Mon Apr 16 21:45:34 2012
@@ -71,6 +71,12 @@ public abstract class ZooKeeperNodeTrack
    * or {@link #getData(boolean)} to get the data of the node if it is available.
    */
   public synchronized void start() {
+    try {
+      ZKUtil.waitForZKConnectionIfAuthenticating(watcher);
+    } catch (InterruptedException e) {
+      throw new IllegalStateException("ZookeeperNodeTracker on " + this.node 
+          + " interuppted while waiting for SASL Authentication", e);
+    }
     this.watcher.registerListener(this);
     try {
       if(ZKUtil.watchAndCheckExists(watcher, node)) {