You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2017/12/20 01:30:18 UTC
[11/24] hbase git commit: HBASE-19555 TestSplitTransactionOnCluster
is flaky
HBASE-19555 TestSplitTransactionOnCluster is flaky
Signed-off-by: tedyu <yu...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/dbe409e2
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/dbe409e2
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/dbe409e2
Branch: refs/heads/HBASE-19397
Commit: dbe409e2c7af5312ab370165b89b57d176486e27
Parents: 03e79b7
Author: Peter Somogyi <ps...@cloudera.com>
Authored: Tue Dec 19 15:04:38 2017 +0100
Committer: tedyu <yu...@gmail.com>
Committed: Tue Dec 19 09:25:57 2017 -0800
----------------------------------------------------------------------
.../regionserver/TestSplitTransactionOnCluster.java | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/dbe409e2/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java
index 92833fd..619ffd0 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java
@@ -313,7 +313,7 @@ public class TestSplitTransactionOnCluster {
// Get region pre-split.
HRegionServer server = cluster.getRegionServer(tableRegionIndex);
printOutRegions(server, "Initial regions: ");
- int regionCount = ProtobufUtil.getOnlineRegions(server.getRSRpcServices()).size();
+ int regionCount = cluster.getRegions(hri.getTable()).size();
regionStates.updateRegionState(hri, RegionState.State.CLOSING);
// Now try splitting.... should fail. And each should successfully
@@ -324,8 +324,7 @@ public class TestSplitTransactionOnCluster {
// Wait around a while and assert count of regions remains constant.
for (int i = 0; i < 10; i++) {
Thread.sleep(100);
- assertEquals(regionCount, ProtobufUtil.getOnlineRegions(
- server.getRSRpcServices()).size());
+ assertEquals(regionCount, cluster.getRegions(hri.getTable()).size());
}
regionStates.updateRegionState(hri, State.OPEN);
// Now try splitting and it should work.
@@ -367,13 +366,13 @@ public class TestSplitTransactionOnCluster {
// Get region pre-split.
HRegionServer server = cluster.getRegionServer(tableRegionIndex);
printOutRegions(server, "Initial regions: ");
- int regionCount = ProtobufUtil.getOnlineRegions(server.getRSRpcServices()).size();
+ int regionCount = cluster.getRegions(hri.getTable()).size();
// Now split.
split(hri, server, regionCount);
// Get daughters
List<HRegion> daughters = checkAndGetDaughters(tableName);
// Now split one of the daughters.
- regionCount = ProtobufUtil.getOnlineRegions(server.getRSRpcServices()).size();
+ regionCount = cluster.getRegions(hri.getTable()).size();
RegionInfo daughter = daughters.get(0).getRegionInfo();
LOG.info("Daughter we are going to split: " + daughter);
// Compact first to ensure we have cleaned up references -- else the split
@@ -809,14 +808,13 @@ public class TestSplitTransactionOnCluster {
private void split(final RegionInfo hri, final HRegionServer server, final int regionCount)
throws IOException, InterruptedException {
- this.admin.splitRegion(hri.getRegionName());
- for (int i = 0; this.cluster.getRegions(hri.getTable()).size() <= regionCount && i < 60; i++) {
+ admin.splitRegion(hri.getRegionName());
+ for (int i = 0; cluster.getRegions(hri.getTable()).size() <= regionCount && i < 60; i++) {
LOG.debug("Waiting on region " + hri.getRegionNameAsString() + " to split");
Thread.sleep(2000);
}
-
assertFalse("Waited too long for split",
- this.cluster.getRegions(hri.getTable()).size() <= regionCount);
+ cluster.getRegions(hri.getTable()).size() <= regionCount);
}
/**