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

HBASE-9008 Reenable TestReplicationKillSlaveRS.killOneSlaveRS 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1506245 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2013-07-23 19:50:28 +00:00
parent b60e27d9d8
commit 4f132dc361
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -730,7 +730,7 @@ public class ReplicationSource extends Thread
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;
}

2
hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillRS.java
View File

@ -115,7 +115,7 @@ public class TestReplicationKillRS extends TestReplicationBase {
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);
}

2
hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillSlaveRS.java
View File

@ -29,7 +29,7 @@ import org.junit.experimental.categories.Category;
@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);
}