You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jd...@apache.org on 2011/10/05 19:37:52 UTC
svn commit: r1179347 - in /hbase/branches/0.90: CHANGES.txt
src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java
Author: jdcryans
Date: Wed Oct 5 17:37:52 2011
New Revision: 1179347
URL: http://svn.apache.org/viewvc?rev=1179347&view=rev
Log:
HBASE-4501 [replication] Shutting down a stream leaves recovered
sources running
Modified:
hbase/branches/0.90/CHANGES.txt
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java
Modified: hbase/branches/0.90/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1179347&r1=1179346&r2=1179347&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Wed Oct 5 17:37:52 2011
@@ -70,6 +70,8 @@ Release 0.90.5 - Unreleased
HBASE-4473 NPE when executors are down but events are still coming in
HBASE-4537 TestUser imports breaking build against secure Hadoop
HBASE-4481 TestMergeTool failed in 0.92 build 20
+ HBASE-4501 [replication] Shutting down a stream leaves recovered
+ sources running
IMPROVEMENT
HBASE-4205 Enhance HTable javadoc (Eric Charles)
Modified: hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java?rev=1179347&r1=1179346&r2=1179347&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java (original)
+++ hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java Wed Oct 5 17:37:52 2011
@@ -345,6 +345,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>();
@@ -355,6 +356,7 @@ public class ReplicationSourceManager {
}
}
for (ReplicationSourceInterface src : oldSourcesToDelete) {
+ src.terminate(terminateMessage);
closeRecoveredQueue((src));
}
LOG.info("Number of deleted recovered sources for " + id + ": "
@@ -370,7 +372,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);
}