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

HBASE-17761: Test TestRemoveRegionMetrics.testMoveRegion fails intermittently because of race condition 

Signed-off-by: Esteban Gutierrez <esteban@apache.org>
This commit is contained in:
Umesh Agashe 2017-03-08 13:25:28 -08:00 committed by Esteban Gutierrez
parent 4ff838df13
commit 2b89748432
3 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
View File

@ -3297,6 +3297,30 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
return am.waitForAssignment(regionInfo); return am.waitForAssignment(regionInfo);
} }
/**
* Move region to destination server and wait till region is completely moved and online
*
* @param destRegion region to move
* @param destServer destination server of the region
* @throws InterruptedException
* @throws IOException
*/
public void moveRegionAndWait(HRegionInfo destRegion, ServerName destServer)
throws InterruptedException, IOException {
HMaster master = getMiniHBaseCluster().getMaster();
getHBaseAdmin().move(destRegion.getEncodedNameAsBytes(),
Bytes.toBytes(destServer.getServerName()));
while (true) {
ServerName serverName = master.getAssignmentManager().getRegionStates()
.getRegionServerOfRegion(destRegion);
if (serverName != null && serverName.equals(destServer)) {
assertRegionOnServer(destRegion, serverName, 200);
break;
}
Thread.sleep(10);
}
}
/** /**
* Wait until all regions for a table in hbase:meta have a non-empty * Wait until all regions for a table in hbase:meta have a non-empty
* info:server, up to a configuable timeout value (default is 60 seconds) * info:server, up to a configuable timeout value (default is 60 seconds)

5
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRemoveRegionMetrics.java
View File

@ -96,7 +96,6 @@ public class TestRemoveRegionMetrics {
int destServerIdx = (currentServerIdx +1)% cluster.getLiveRegionServerThreads().size(); int destServerIdx = (currentServerIdx +1)% cluster.getLiveRegionServerThreads().size();
HRegionServer currentServer = cluster.getRegionServer(currentServerIdx); HRegionServer currentServer = cluster.getRegionServer(currentServerIdx);
HRegionServer destServer = cluster.getRegionServer(destServerIdx); HRegionServer destServer = cluster.getRegionServer(destServerIdx);
byte[] destServerName = Bytes.toBytes(destServer.getServerName().getServerName());
// Do a put. The counters should be non-zero now // Do a put. The counters should be non-zero now
@ -119,13 +118,11 @@ public class TestRemoveRegionMetrics {
try { try {
admin.move(regionInfo.getEncodedNameAsBytes(), destServerName); TEST_UTIL.moveRegionAndWait(regionInfo, destServer.getServerName());
moved = true; moved = true;
Thread.sleep(5000);
} catch (IOException ioe) { } catch (IOException ioe) {
moved = false; moved = false;
} }
TEST_UTIL.waitUntilAllRegionsAssigned(t.getName());
if (moved) { if (moved) {
MetricsRegionAggregateSource destAgg = destServer.getRegion(regionInfo.getRegionName()) MetricsRegionAggregateSource destAgg = destServer.getRegion(regionInfo.getRegionName())

23
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestWALReplay.java
View File

@ -218,7 +218,7 @@ public abstract class AbstractTestWALReplay {
HRegionServer originServer = hbaseCluster.getRegionServer(originServerNum); HRegionServer originServer = hbaseCluster.getRegionServer(originServerNum);
HRegionServer destServer = hbaseCluster.getRegionServer(destServerNum); HRegionServer destServer = hbaseCluster.getRegionServer(destServerNum);
// move region to destination regionserver // move region to destination regionserver
moveRegionAndWait(destRegion, destServer); TEST_UTIL.moveRegionAndWait(destRegion.getRegionInfo(), destServer.getServerName());
// delete the row // delete the row
Delete del = new Delete(Bytes.toBytes("r1")); Delete del = new Delete(Bytes.toBytes("r1"));
@ -241,7 +241,7 @@ public abstract class AbstractTestWALReplay {
region.compact(true); region.compact(true);
// move region to origin regionserver // move region to origin regionserver
moveRegionAndWait(destRegion, originServer); TEST_UTIL.moveRegionAndWait(destRegion.getRegionInfo(), originServer.getServerName());
// abort the origin regionserver // abort the origin regionserver
originServer.abort("testing"); originServer.abort("testing");
@ -254,25 +254,6 @@ public abstract class AbstractTestWALReplay {
resultScanner.close(); resultScanner.close();
} }
private void moveRegionAndWait(Region destRegion, HRegionServer destServer)
throws InterruptedException, MasterNotRunningException,
ZooKeeperConnectionException, IOException {
HMaster master = TEST_UTIL.getMiniHBaseCluster().getMaster();
TEST_UTIL.getAdmin().move(
destRegion.getRegionInfo().getEncodedNameAsBytes(),
Bytes.toBytes(destServer.getServerName().getServerName()));
while (true) {
ServerName serverName = master.getAssignmentManager()
.getRegionStates().getRegionServerOfRegion(destRegion.getRegionInfo());
if (serverName != null && serverName.equals(destServer.getServerName())) {
TEST_UTIL.assertRegionOnServer(
destRegion.getRegionInfo(), serverName, 200);
break;
}
Thread.sleep(10);
}
}
/** /**
* Tests for hbase-2727. * Tests for hbase-2727.
* @throws Exception * @throws Exception