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

[jd...@apache.org]

Author: jdcryans
Date: Wed Oct  5 17:36:58 2011
New Revision: 1179345

URL: http://svn.apache.org/viewvc?rev=1179345&view=rev
Log:
   HBASE-4501  [replication] Shutting down a stream leaves recovered
               sources running

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=1179345&r1=1179344&r2=1179345&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Wed Oct  5 17:36:58 2011
@@ -702,6 +702,8 @@ Release 0.90.5 - Unreleased
    HBASE-4515  User.getCurrent() can fail to initialize the current user
    HBASE-4473  NPE when executors are down but events are still coming in
    HBASE-4537  TestUser imports breaking build against secure Hadoop
+   HBASE-4501  [replication] Shutting down a stream leaves recovered
+               sources running
 
   IMPROVEMENT
    HBASE-4205  Enhance HTable javadoc (Eric Charles)

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=1179345&r1=1179344&r2=1179345&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 Wed Oct  5 17:36:58 2011
@@ -354,6 +354,7 @@ public class ReplicationSourceManager {
     LOG.info("Closing the following queue " + id + ", currently have "
         + sources.size() + " and another "
         + oldsources.size() + " that were recovered");
+    String terminateMessage = "Replication stream was removed by a user";
     ReplicationSourceInterface srcToRemove = null;
     List<ReplicationSourceInterface> oldSourcesToDelete =
         new ArrayList<ReplicationSourceInterface>();
@@ -364,6 +365,7 @@ public class ReplicationSourceManager {
       }
     }
     for (ReplicationSourceInterface src : oldSourcesToDelete) {
+      src.terminate(terminateMessage);
       closeRecoveredQueue((src));
     }
     LOG.info("Number of deleted recovered sources for " + id + ": "
@@ -379,7 +381,7 @@ public class ReplicationSourceManager {
       LOG.error("The queue we wanted to close is missing " + id);
       return;
     }
-    srcToRemove.terminate("Replication stream was removed by a user");
+    srcToRemove.terminate(terminateMessage);
     this.sources.remove(srcToRemove);
     this.zkHelper.deleteSource(id, true);
   }