svn commit: r1560198 - in /hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/replication: ReplicationZookeeper.java regionserver/ReplicationSourceManager.java

[jd...@apache.org]

Author: jdcryans
Date: Tue Jan 21 21:30:12 2014
New Revision: 1560198

URL: http://svn.apache.org/r1560198
Log:
HBASE-10249 TestReplicationSyncUpTool fails because failover takes too long

Modified:
    hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/replication/ReplicationZookeeper.java
    hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java

Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/replication/ReplicationZookeeper.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/replication/ReplicationZookeeper.java?rev=1560198&r1=1560197&r2=1560198&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/replication/ReplicationZookeeper.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/replication/ReplicationZookeeper.java Tue Jan 21 21:30:12 2014
@@ -632,6 +632,16 @@ public class ReplicationZookeeper {
   }
 
   /**
+   * Checks if the provided znode is the same as this region server's
+   * @param znode to check
+   * @return if this is this rs's znode
+   */
+  public boolean isThisOurZnode(String znode) {
+    String otherRs = ZKUtil.joinZNode(this.rsZNode, znode);
+    return otherRs.equals(rsServerNameZnode);
+  }
+
+  /**
    * Try to set a lock in another server's znode.
    * @param znode the server names of the other server
    * @return true if the lock was acquired, false in every other cases
@@ -639,10 +649,6 @@ public class ReplicationZookeeper {
   public boolean lockOtherRS(String znode) {
     try {
       String parent = ZKUtil.joinZNode(this.rsZNode, znode);
-      if (parent.equals(rsServerNameZnode)) {
-        LOG.warn("Won't lock because this is us, we're dead!");
-        return false;
-      }
       String p = ZKUtil.joinZNode(parent, RS_LOCK_ZNODE);
       ZKUtil.createAndWatch(this.zookeeper, p, Bytes.toBytes(rsServerNameZnode));
     } catch (KeeperException e) {

Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java?rev=1560198&r1=1560197&r2=1560198&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java Tue Jan 21 21:30:12 2014
@@ -594,6 +594,10 @@ public class ReplicationSourceManager {
 
     @Override
     public void run() {
+      // We could end up checking if this is us
+      if (zkHelper.isThisOurZnode(this.rsZnode)) {
+        return;
+      }
       // Wait a bit before transferring the queues, we may be shutting down.
       // This sleep may not be enough in some cases.
       try {