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 17:15:29 UTC

[11/12] git commit: HBASE-11546 Backport ZK-less region assignment to 0.98 (Virag Kothari) [7/8]

HBASE-11546 Backport ZK-less region assignment to 0.98 (Virag Kothari) [7/8]

HBASE-11615 TestZKLessAMOnCluster.testForceAssignWhileClosing failed on Jenkins (Jimmy Xiang)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3ad7efd8
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3ad7efd8
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3ad7efd8

Branch: refs/heads/0.98
Commit: 3ad7efd8c3b130fecc1d1dbef6099a08e97e2a22
Parents: e09adb8
Author: Andrew Purtell <ap...@apache.org>
Authored: Tue Aug 26 08:01:10 2014 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Tue Aug 26 08:04:17 2014 -0700

----------------------------------------------------------------------
 .../apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/3ad7efd8/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 c3a507d..c20347e 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
@@ -380,6 +380,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);