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

HBASE-16669 Fix flakey TestAdmin1#testMergeRegions 

Has been failing with incorrect region counts
This commit is contained in:
Jonathan M Hsieh 2016-09-21 12:10:42 -07:00
parent 593fb75083
commit 055dde7dfc
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin1.java
View File

@ -30,6 +30,8 @@ import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@ -1180,8 +1182,10 @@ public class TestAdmin1 {
gotException = false; gotException = false;
// Try merging a replica with another. Should fail. // Try merging a replica with another. Should fail.
try { try {
// TODO convert this to version that is synchronous (See HBASE-16668)
TEST_UTIL.getAdmin().mergeRegionsAsync(regions.get(1).getFirst().getEncodedNameAsBytes(), TEST_UTIL.getAdmin().mergeRegionsAsync(regions.get(1).getFirst().getEncodedNameAsBytes(),
regions.get(2).getFirst().getEncodedNameAsBytes(), true); regions.get(2).getFirst().getEncodedNameAsBytes(), true)
.get(60, TimeUnit.SECONDS);
} catch (IllegalArgumentException m) { } catch (IllegalArgumentException m) {
gotException = true; gotException = true;
} }
@ -1358,7 +1362,7 @@ public class TestAdmin1 {
} }
} }
@Test @Test (timeout=300000)
public void testMergeRegions() throws Exception { public void testMergeRegions() throws Exception {
TableName tableName = TableName.valueOf("testMergeWithFullRegionName"); TableName tableName = TableName.valueOf("testMergeWithFullRegionName");
HColumnDescriptor cd = new HColumnDescriptor("d"); HColumnDescriptor cd = new HColumnDescriptor("d");
@ -1380,17 +1384,21 @@ public class TestAdmin1 {
assertEquals(3, admin.getTableRegions(tableName).size()); assertEquals(3, admin.getTableRegions(tableName).size());
regionA = tableRegions.get(0); regionA = tableRegions.get(0);
regionB = tableRegions.get(1); regionB = tableRegions.get(1);
admin.mergeRegionsAsync(regionA.getRegionName(), regionB.getRegionName(), false); // TODO convert this to version that is synchronous (See HBASE-16668)
Thread.sleep(1000); admin.mergeRegionsAsync(regionA.getRegionName(), regionB.getRegionName(), false)
.get(60, TimeUnit.SECONDS);
assertEquals(2, admin.getTableRegions(tableName).size()); assertEquals(2, admin.getTableRegions(tableName).size());
// merge with encoded name // merge with encoded name
tableRegions = admin.getTableRegions(tableName); tableRegions = admin.getTableRegions(tableName);
regionA = tableRegions.get(0); regionA = tableRegions.get(0);
regionB = tableRegions.get(1); regionB = tableRegions.get(1);
// TODO convert this to version that is synchronous (See HBASE-16668)
admin.mergeRegionsAsync( admin.mergeRegionsAsync(
regionA.getEncodedNameAsBytes(), regionB.getEncodedNameAsBytes(), false); regionA.getEncodedNameAsBytes(), regionB.getEncodedNameAsBytes(), false)
Thread.sleep(1000); .get(60, TimeUnit.SECONDS);
assertEquals(1, admin.getTableRegions(tableName).size()); assertEquals(1, admin.getTableRegions(tableName).size());
} finally { } finally {
this.admin.disableTable(tableName); this.admin.disableTable(tableName);