svn commit: r834515 - in /hadoop/hbase/branches/0.20: CHANGES.txt src/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWrapper.java

[stack]

Author: stack
Date: Tue Nov 10 15:50:17 2009
New Revision: 834515

URL: http://svn.apache.org/viewvc?rev=834515&view=rev
Log:
HBASE-1965 On restart of branch, master complains about not being able to set 
safe mode

Modified:
    hadoop/hbase/branches/0.20/CHANGES.txt
    
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWrapper.java

Modified: hadoop/hbase/branches/0.20/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/CHANGES.txt?rev=834515&r1=834514&r2=834515&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/CHANGES.txt (original)
+++ hadoop/hbase/branches/0.20/CHANGES.txt Tue Nov 10 15:50:17 2009
@@ -45,6 +45,8 @@
                java5
    HBASE-1967  [Transactional] client.TestTransactions.testPutPutScan fails
                sometimes - Temporary fix
+   HBASE-1965  On restart of branch, master complains about not being able
+               to set safe mode
 
   IMPROVEMENTS
    HBASE-1899  Use scanner caching in shell count

Modified: 
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWrapper.java
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWrapper.java?rev=834515&r1=834514&r2=834515&view=diff
==============================================================================
--- 
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWrapper.java
 (original)
+++ 
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWrapper.java
 Tue Nov 10 15:50:17 2009
@@ -501,6 +501,10 @@
       LOG.warn("Failed to create out of safe mode in ZooKeeper: " + e);
     } catch (KeeperException e) {
       LOG.warn("Failed to create out of safe mode in ZooKeeper: " + e);
+      if (e.getMessage().contains("KeeperErrorCode = NodeExists")) {
+        LOG.info("Node exists; just move on");
+        return true;
+      }
     }
 
     return false;