Index: hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillSlaveRS.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillSlaveRS.java (revision 1505822) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillSlaveRS.java (working copy) @@ -29,7 +29,7 @@ @Category(LargeTests.class) public class TestReplicationKillSlaveRS extends TestReplicationKillRS { - @Ignore ("Flakey. See HBASE-9008 and HBASE-9007") @Test(timeout=300000) + @Test(timeout=300000) public void killOneSlaveRS() throws Exception { loadTableAndKillRS(utility2); } Index: hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillRS.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillRS.java (revision 1505822) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillRS.java (working copy) @@ -115,7 +115,7 @@ public void run() { try { Thread.sleep(timeout); - utility.expireRegionServerSession(rs); + utility.getHBaseCluster().getRegionServer(rs).stop("Stopping as part of the test"); } catch (Exception e) { LOG.error("Couldn't kill a region server", e); } 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 1505822) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java (working copy) @@ -730,7 +730,7 @@ return true; } else if (this.replicationQueueInfo.isQueueRecovered()) { this.manager.closeRecoveredQueue(this); - LOG.info("Finished recovering the queue"); + LOG.info("Finished recovering the queue with the following stats " + getStats()); this.running = false; return true; }