You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2014/08/26 16:59:47 UTC
[2/2] git commit: HBASE-11814 TestAssignmentManager.testCloseFailed()
and testOpenCloseRacing() is flaky (Virag Kothari)
HBASE-11814 TestAssignmentManager.testCloseFailed() and testOpenCloseRacing() is flaky (Virag Kothari)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/02fed866
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/02fed866
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/02fed866
Branch: refs/heads/branch-1
Commit: 02fed866cebe766231eb9ca262f4760145ebba4b
Parents: 2fa197d
Author: Andrew Purtell <ap...@apache.org>
Authored: Tue Aug 26 07:51:09 2014 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Tue Aug 26 07:51:19 2014 -0700
----------------------------------------------------------------------
.../hbase/master/TestAssignmentManagerOnCluster.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/02fed866/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java
index 0ee6037..7beda90 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java
@@ -485,6 +485,8 @@ public class TestAssignmentManagerOnCluster {
master.assignRegion(hri);
AssignmentManager am = master.getAssignmentManager();
assertTrue(am.waitForAssignment(hri));
+ ServerName sn = am.getRegionStates().getRegionServerOfRegion(hri);
+ TEST_UTIL.assertRegionOnServer(hri, sn, 6000);
MyRegionObserver.preCloseEnabled.set(true);
am.unassign(hri);
@@ -669,10 +671,8 @@ public class TestAssignmentManagerOnCluster {
master.assignRegion(hri);
AssignmentManager am = master.getAssignmentManager();
assertTrue(am.waitForAssignment(hri));
- while (!HBaseTestingUtility.getAllOnlineRegions(
- TEST_UTIL.getHBaseCluster()).contains(hri.getRegionNameAsString())) {
- Threads.sleep(100); // This won't take long
- }
+ ServerName sn = am.getRegionStates().getRegionServerOfRegion(hri);
+ TEST_UTIL.assertRegionOnServer(hri, sn, 6000);
MyRegionObserver.postCloseEnabled.set(true);
am.unassign(hri);
@@ -769,7 +769,7 @@ public class TestAssignmentManagerOnCluster {
ServerName serverName = master.getAssignmentManager().
getRegionStates().getRegionServerOfRegion(hri);
- TEST_UTIL.assertRegionOnlyOnServer(hri, serverName, 200);
+ TEST_UTIL.assertRegionOnlyOnServer(hri, serverName, 6000);
} finally {
MyRegionObserver.postOpenEnabled.set(false);
TEST_UTIL.deleteTable(Bytes.toBytes(table));
@@ -841,7 +841,7 @@ public class TestAssignmentManagerOnCluster {
ServerName serverName = master.getAssignmentManager().
getRegionStates().getRegionServerOfRegion(hri);
- TEST_UTIL.assertRegionOnlyOnServer(hri, serverName, 200);
+ TEST_UTIL.assertRegionOnlyOnServer(hri, serverName, 6000);
} finally {
if (master != null) {
master.enableSSH(true);