svn commit: r1001014 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java

[jdcryans]

Author: jdcryans
Date: Fri Sep 24 18:32:26 2010
New Revision: 1001014

URL: http://svn.apache.org/viewvc?rev=1001014&view=rev
Log:
HBASE-2989  [replication] RSM won't cleanup after locking if 0 peers

Modified:
    hbase/trunk/CHANGES.txt
    
hbase/trunk/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java

Modified: hbase/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1001014&r1=1001013&r2=1001014&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Fri Sep 24 18:32:26 2010
@@ -538,6 +538,7 @@ Release 0.21.0 - Unreleased
    HBASE-3003  ClassSize constants dont use 'final'
    HBASE-3002  Fix zookeepers.sh to work properly with strange JVM options
    HBASE-3028  No basescanner means no GC'ing of split, offlined parent regions
+   HBASE-2989  [replication] RSM won't cleanup after locking if 0 peers
 
   IMPROVEMENTS
    HBASE-1760  Cleanup TODOs in HTable

Modified: 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java?rev=1001014&r1=1001013&r2=1001014&view=diff
==============================================================================
--- 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java
 (original)
+++ 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java
 Fri Sep 24 18:32:26 2010
@@ -285,10 +285,10 @@ public class ReplicationSourceManager {
     LOG.info("Moving " + rsZnode + "'s hlogs to my queue");
     SortedMap<String, SortedSet<String>> newQueues =
         this.zkHelper.copyQueuesFromRS(rsZnode);
+    this.zkHelper.deleteRsQueues(rsZnode);
     if (newQueues == null || newQueues.size() == 0) {
       return;
     }
-    this.zkHelper.deleteRsQueues(rsZnode);
 
     for (Map.Entry<String, SortedSet<String>> entry : newQueues.entrySet()) {
       String peerId = entry.getKey();