diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationHLogReaderManager.java hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationHLogReaderManager.java index 5a43636..4ea518e 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationHLogReaderManager.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationHLogReaderManager.java @@ -123,15 +123,20 @@ public class ReplicationHLogReaderManager { public void closeReader() throws IOException { if (this.reader != null) { this.reader.close(); + this.reader = null; } } /** * Tell the helper to reset internal state */ - public void finishCurrentFile() { + void finishCurrentFile() { this.position = 0; - this.reader = null; + try { + this.closeReader(); + } catch (IOException e) { + LOG.warn("Unable to close reader", e); + } } } diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java index c0429ab..3b5136b 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java @@ -326,6 +326,7 @@ public class ReplicationSource extends Thread } boolean gotIOE = false; + currentNbOperations = 0; currentNbEntries = 0; currentSize = 0; try {