hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r1506245 - in /hbase/trunk/hbase-server/src: main/java/org/apache/hadoop/hbase/replication/regionserver/ test/java/org/apache/hadoop/hbase/replication/
Date Tue, 23 Jul 2013 19:50:29 GMT
Author: stack
Date: Tue Jul 23 19:50:28 2013
New Revision: 1506245

URL: http://svn.apache.org/r1506245
Log:
HBASE-9008 Reenable TestReplicationKillSlaveRS.killOneSlaveRS

Modified:
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
    hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillRS.java
    hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillSlaveRS.java

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java?rev=1506245&r1=1506244&r2=1506245&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
(original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
Tue Jul 23 19:50:28 2013
@@ -730,7 +730,7 @@ public class ReplicationSource extends T
       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;
     }

Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillRS.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillRS.java?rev=1506245&r1=1506244&r2=1506245&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillRS.java
(original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillRS.java
Tue Jul 23 19:50:28 2013
@@ -115,7 +115,7 @@ public class TestReplicationKillRS exten
       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);
         }

Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillSlaveRS.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillSlaveRS.java?rev=1506245&r1=1506244&r2=1506245&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillSlaveRS.java
(original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillSlaveRS.java
Tue Jul 23 19:50:28 2013
@@ -29,7 +29,7 @@ import org.junit.experimental.categories
 @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);
   }



Mime
View raw message