You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by an...@apache.org on 2013/11/19 18:10:33 UTC
svn commit: r1543501 - in
/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase:
regionserver/HRegionServer.java replication/regionserver/ReplicationSink.java
Author: anoopsamjohn
Date: Tue Nov 19 17:10:32 2013
New Revision: 1543501
URL: http://svn.apache.org/r1543501
Log:
HBASE-9995 Not stopping ReplicationSink when using custom implementation for the ReplicationSink
Modified:
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.java
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1543501&r1=1543500&r2=1543501&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Tue Nov 19 17:10:32 2013
@@ -1878,10 +1878,13 @@ public class HRegionServer implements Cl
if (this.replicationSourceHandler != null &&
this.replicationSourceHandler == this.replicationSinkHandler) {
this.replicationSourceHandler.stopReplicationService();
- } else if (this.replicationSourceHandler != null) {
- this.replicationSourceHandler.stopReplicationService();
- } else if (this.replicationSinkHandler != null) {
- this.replicationSinkHandler.stopReplicationService();
+ } else {
+ if (this.replicationSourceHandler != null) {
+ this.replicationSourceHandler.stopReplicationService();
+ }
+ if (this.replicationSinkHandler != null) {
+ this.replicationSinkHandler.stopReplicationService();
+ }
}
}
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.java?rev=1543501&r1=1543500&r2=1543501&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.java Tue Nov 19 17:10:32 2013
@@ -217,7 +217,7 @@ public class ReplicationSink {
/**
* Do the changes and handle the pool
* @param tableName table to insert into
- * @param rows list of actions
+ * @param allRows list of actions
* @throws IOException
*/
protected void batch(TableName tableName, Collection<List<Row>> allRows) throws IOException {