Index: 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 (revision 1391658) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java (working copy) @@ -283,8 +283,15 @@ } continue; } + Path oldPath = getCurrentPath(); //note that in the current scenario, + //oldPath will be null when a log roll + //happens. // Get a new path - if (!getNextPath()) { + boolean hasCurrentPath = getNextPath(); + if (getCurrentPath() != null && oldPath == null) { + sleepMultiplier = 1; //reset the sleepMultiplier on a path change + } + if (!hasCurrentPath) { if (sleepForRetries("No log to process", sleepMultiplier)) { sleepMultiplier++; }