Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-9995 Not stopping ReplicationSink when using custom implementation for the ReplicationSink 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1543501 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
anoopsamjohn 2013-11-19 17:10:32 +00:00
parent 74f6e25c8f
commit 335071f342
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
View File

@ -1878,10 +1878,13 @@ public class HRegionServer implements ClientProtos.ClientService.BlockingInterfa
if (this.replicationSourceHandler != null && if (this.replicationSourceHandler != null &&
this.replicationSourceHandler == this.replicationSinkHandler) { this.replicationSourceHandler == this.replicationSinkHandler) {
this.replicationSourceHandler.stopReplicationService(); this.replicationSourceHandler.stopReplicationService();
} else if (this.replicationSourceHandler != null) { } else {
this.replicationSourceHandler.stopReplicationService(); if (this.replicationSourceHandler != null) {
} else if (this.replicationSinkHandler != null) { this.replicationSourceHandler.stopReplicationService();
this.replicationSinkHandler.stopReplicationService(); }
if (this.replicationSinkHandler != null) {
this.replicationSinkHandler.stopReplicationService();
}
} }
} }

2
hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.java
View File

@ -217,7 +217,7 @@ public class ReplicationSink {
/** /**
* Do the changes and handle the pool * Do the changes and handle the pool
* @param tableName table to insert into * @param tableName table to insert into
* @param rows list of actions * @param allRows list of actions
* @throws IOException * @throws IOException
*/ */
protected void batch(TableName tableName, Collection<List<Row>> allRows) throws IOException { protected void batch(TableName tableName, Collection<List<Row>> allRows) throws IOException {