hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From te...@apache.org
Subject svn commit: r1326815 - in /hbase/branches/0.92: CHANGES.txt src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.java
Date Mon, 16 Apr 2012 21:59:17 GMT
Author: tedyu
Date: Mon Apr 16 21:59:17 2012
New Revision: 1326815

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

Modified:
    hbase/branches/0.92/CHANGES.txt
    hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.java

Modified: hbase/branches/0.92/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1326815&r1=1326814&r2=1326815&view=diff
==============================================================================
--- hbase/branches/0.92/CHANGES.txt (original)
+++ hbase/branches/0.92/CHANGES.txt Mon Apr 16 21:59:17 2012
@@ -40,6 +40,7 @@ Release 0.92.2 - Unreleased
    HBASE-5488  OfflineMetaRepair doesn't support hadoop 0.20's fs.default.name property (gaojinchao)
    HBASE-5781  Zookeeper session got closed while trying to assign the region to RS using
hbck -fix
    HBASE-5793  TestHBaseFsck#TestNoHdfsTable test hangs after client retries increased
+   HBASE-5780  Fix race in HBase regionserver startup vs ZK SASL authentication (Shaneal
Manek)
 
   IMPROVEMENTS
    HBASE-5592  Make it easier to get a table from shell (Ben West)

Modified: hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.java?rev=1326815&r1=1326814&r2=1326815&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.java
(original)
+++ hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.java
Mon Apr 16 21:59:17 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)) {



Mime
View raw message