[hbase] branch branch-1.4 updated: Addendum HBASE-22330 Backport HBASE-20724 (Sometimes some compacted storefiles are still opened after region failover) to branch-1

[achouhan]

This is an automated email from the ASF dual-hosted git repository.

achouhan pushed a commit to branch branch-1.4
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-1.4 by this push:
     new 288794d  Addendum HBASE-22330 Backport HBASE-20724 (Sometimes some 
compacted storefiles are still opened after region failover) to branch-1
288794d is described below

commit 288794d68ba5bd4d1fd8d5c315cee972019dcb3d
Author: Abhishek Singh Chouhan <achou...@apache.org>
AuthorDate: Thu May 9 12:11:32 2019 -0700

    Addendum HBASE-22330 Backport HBASE-20724 (Sometimes some compacted 
storefiles are still opened after region failover) to branch-1
---
 .../hbase/regionserver/TestCleanupCompactedFileAfterFailover.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCleanupCompactedFileAfterFailover.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCleanupCompactedFileAfterFailover.java
index edd1f6f..b8d8df9 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCleanupCompactedFileAfterFailover.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCleanupCompactedFileAfterFailover.java
@@ -87,7 +87,7 @@ public class TestCleanupCompactedFileAfterFailover {
     HTableDescriptor htd = new HTableDescriptor(TABLE_NAME);
     htd.addFamily(new HColumnDescriptor(FAMILY));
     admin.createTable(htd);
-    TEST_UTIL.waitTableAvailable(TABLE_NAME);
+    TEST_UTIL.waitTableAvailable(TABLE_NAME, 30000);
     table = TEST_UTIL.getConnection().getTable(TABLE_NAME);
   }
 
@@ -159,7 +159,7 @@ public class TestCleanupCompactedFileAfterFailover {
     rsServedTable.kill();
     // Sleep to wait failover
     Thread.sleep(3000);
-    TEST_UTIL.waitTableAvailable(TABLE_NAME);
+    TEST_UTIL.waitTableAvailable(TABLE_NAME, 30000);
 
     regions.clear();
     for (JVMClusterUtil.RegionServerThread rsThread : 
TEST_UTIL.getHBaseCluster()