HBASE-20612 TestReplicationKillSlaveRSWithSeparateOldWALs sometimes fail because it uses an expired cluster conn

hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCallerImpl.java

@@ -108,7 +108,6 @@ public class RpcRetryingCallerImpl<T> implements RpcRetryingCaller<T> {
       } catch (PreemptiveFastFailException e) {
         throw e;
       } catch (Throwable t) {
-        Throwable e = t.getCause();
         ExceptionUtil.rethrowIfInterrupt(t);
         Throwable cause = t.getCause();
         if (cause instanceof DoNotRetryIOException) {

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

@@ -22,9 +22,12 @@ import static org.junit.Assert.fail;
 import org.apache.hadoop.hbase.HBaseClassTestRule;
 import org.apache.hadoop.hbase.HBaseTestingUtility;
 import org.apache.hadoop.hbase.UnknownScannerException;
+import org.apache.hadoop.hbase.client.Connection;
+import org.apache.hadoop.hbase.client.ConnectionFactory;
 import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.client.ResultScanner;
 import org.apache.hadoop.hbase.client.Scan;
+import org.apache.hadoop.hbase.client.Table;
 import org.apache.hadoop.hbase.testclassification.LargeTests;
 import org.apache.hadoop.hbase.testclassification.ReplicationTests;
 import org.junit.ClassRule;
@@ -32,7 +35,7 @@ import org.junit.experimental.categories.Category;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Category({ReplicationTests.class, LargeTests.class})
+@Category({ ReplicationTests.class, LargeTests.class })
 public class TestReplicationKillRS extends TestReplicationBase {
 
   @ClassRule
@@ -42,40 +45,36 @@ public class TestReplicationKillRS extends TestReplicationBase {
   private static final Logger LOG = LoggerFactory.getLogger(TestReplicationKillRS.class);
 
   /**
-   * Load up 1 tables over 2 region servers and kill a source during
+   * Load up 1 tables over 2 region servers and kill a source during the upload. The failover
-   * the upload. The failover happens internally.
+   * happens internally. WARNING this test sometimes fails because of HBASE-3515
-   *
-   * WARNING this test sometimes fails because of HBASE-3515
-   *
-   * @throws Exception
    */
   public void loadTableAndKillRS(HBaseTestingUtility util) throws Exception {
     // killing the RS with hbase:meta can result into failed puts until we solve
     // IO fencing
-    int rsToKill1 =
+    int rsToKill1 = util.getHBaseCluster().getServerWithMeta() == 0 ? 1 : 0;
-        util.getHBaseCluster().getServerWithMeta() == 0 ? 1 : 0;
 
     // Takes about 20 secs to run the full loading, kill around the middle
     Thread killer = killARegionServer(util, 5000, rsToKill1);
-
+    Result[] res;
+    int initialCount;
+    try (Connection conn = ConnectionFactory.createConnection(conf1)) {
+      try (Table table = conn.getTable(tableName)) {
         LOG.info("Start loading table");
-    int initialCount = utility1.loadTable(htable1, famName);
+        initialCount = utility1.loadTable(table, famName);
         LOG.info("Done loading table");
         killer.join(5000);
         LOG.info("Done waiting for threads");
 
-    Result[] res;
         while (true) {
-      try {
+          try (ResultScanner scanner = table.getScanner(new Scan())) {
-        Scan scan = new Scan();
-        ResultScanner scanner = htable1.getScanner(scan);
             res = scanner.next(initialCount);
-        scanner.close();
             break;
           } catch (UnknownScannerException ex) {
             LOG.info("Cluster wasn't ready yet, restarting scanner");
           }
         }
+      }
+    }
     // Test we actually have all the rows, we may miss some because we
     // don't have IO fencing.
     if (res.length != initialCount) {
@@ -85,18 +84,19 @@ public class TestReplicationKillRS extends TestReplicationBase {
     }
 
     int lastCount = 0;
-
     final long start = System.currentTimeMillis();
     int i = 0;
+    try (Connection conn = ConnectionFactory.createConnection(conf2)) {
+      try (Table table = conn.getTable(tableName)) {
         while (true) {
-      if (i==NB_RETRIES-1) {
+          if (i == NB_RETRIES - 1) {
-        fail("Waited too much time for queueFailover replication. " +
+            fail("Waited too much time for queueFailover replication. " + "Waited "
-            "Waited "+(System.currentTimeMillis() - start)+"ms.");
+                + (System.currentTimeMillis() - start) + "ms.");
+          }
+          Result[] res2;
+          try (ResultScanner scanner = table.getScanner(new Scan())) {
+            res2 = scanner.next(initialCount * 2);
           }
-      Scan scan2 = new Scan();
-      ResultScanner scanner2 = htable2.getScanner(scan2);
-      Result[] res2 = scanner2.next(initialCount * 2);
-      scanner2.close();
           if (res2.length < initialCount) {
             if (lastCount < res2.length) {
               i--; // Don't increment timeout if we make progress
@@ -104,17 +104,19 @@ public class TestReplicationKillRS extends TestReplicationBase {
               i++;
             }
             lastCount = res2.length;
-        LOG.info("Only got " + lastCount + " rows instead of " +
+            LOG.info(
-            initialCount + " current i=" + i);
+              "Only got " + lastCount + " rows instead of " + initialCount + " current i=" + i);
-        Thread.sleep(SLEEP_TIME*2);
+            Thread.sleep(SLEEP_TIME * 2);
           } else {
             break;
           }
         }
       }
+    }
+  }
 
-  private static Thread killARegionServer(final HBaseTestingUtility utility,
+  private static Thread killARegionServer(final HBaseTestingUtility utility, final long timeout,
-                                          final long timeout, final int rs) {
+      final int rs) {
     Thread killer = new Thread() {
       @Override
       public void run() {