Repository: hbase Updated Branches: refs/heads/branch-1.2 895f53468 -> 9446b99a5
HBASE-13895 DATALOSS: Region assigned before WAL replay when abort (Enis Soztutar) -- NEW ADDENDUM TO FIX TestAssignmentManager Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/9446b99a Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9446b99a Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9446b99a Branch: refs/heads/branch-1.2 Commit: 9446b99a5af3d710400b13dc4756d254ec203a41 Parents: 895f534 Author: stack <st...@apache.org> Authored: Thu Jul 2 00:04:36 2015 -0700 Committer: stack <st...@apache.org> Committed: Thu Jul 2 00:04:36 2015 -0700 ---------------------------------------------------------------------- .../hadoop/hbase/master/TestAssignmentManager.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/9446b99a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java index b43138b..aadb69e 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java @@ -1182,7 +1182,7 @@ public class TestAssignmentManager { // Create an AM. final AssignmentManagerWithExtrasForTesting am = setUpMockedAssignmentManager(this.server, this.serverManager); - // First set up region as being online on SERVERNAME_B. + // First set up region as being online on SERVERNAME_LIVE. am.getRegionStates().regionOnline(REGIONINFO, SERVERNAME_LIVE); // Now add region in pending open up in RIT RegionState state = new RegionState(REGIONINFO, @@ -1628,10 +1628,10 @@ public class TestAssignmentManager { this.serverManager, balancer, null, null, master.getTableLockManager()); RegionStates regionStates = am.getRegionStates(); - regionStates.createRegionState(hri, State.OPEN, SERVERNAME_B, SERVERNAME_B); + regionStates.createRegionState(hri, State.OPEN, SERVERNAME_LIVE, SERVERNAME_LIVE); // mock aborting region server - Mockito.when(this.serverManager.sendRegionClose(Mockito.eq(SERVERNAME_B), Mockito.eq(REGIONINFO), + Mockito.when(this.serverManager.sendRegionClose(Mockito.eq(SERVERNAME_LIVE), Mockito.eq(REGIONINFO), Mockito.anyInt(), (ServerName)Mockito.any(), Mockito.anyBoolean())) .thenThrow(new RegionServerAbortedException("")); @@ -1640,7 +1640,7 @@ public class TestAssignmentManager { // assert that the we have FAILED_CLOSE for region state assertEquals(State.FAILED_CLOSE, regionStates.getRegionState(REGIONINFO).getState()); - assertEquals(SERVERNAME_B, regionStates.getRegionState(REGIONINFO).getServerName()); + assertEquals(SERVERNAME_LIVE, regionStates.getRegionState(REGIONINFO).getServerName()); am.shutdown(); } @@ -1665,10 +1665,10 @@ public class TestAssignmentManager { }; RegionStates regionStates = am.getRegionStates(); - regionStates.createRegionState(hri, State.OPEN, SERVERNAME_B, SERVERNAME_B); + regionStates.createRegionState(hri, State.OPEN, SERVERNAME_LIVE, SERVERNAME_LIVE); // mock that RS is expired, but not processed - Mockito.when(this.serverManager.isServerOnline(SERVERNAME_B)) + Mockito.when(this.serverManager.isServerOnline(SERVERNAME_LIVE)) .thenReturn(false); // try to unassign the region @@ -1679,7 +1679,7 @@ public class TestAssignmentManager { // try to assign the region before SSH am.regionPlans.put(REGIONINFO.getEncodedName(), - new RegionPlan(REGIONINFO, null, SERVERNAME_A)); + new RegionPlan(REGIONINFO, null, SERVERNAME_DEAD)); am.assign(hri, true, false); // assert that the we still have OFFLINE
