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

HBASE-13895 DATALOSS: Region assigned before WAL replay when abort (Enis Soztutar) -- ADDENDUM

This commit is contained in:
stack 2015-07-01 22:01:38 -07:00
parent 09846ff81a
commit 7b4febbc2b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
View File

@ -1628,10 +1628,10 @@ public class TestAssignmentManager {
this.serverManager, balancer, null, null, master.getTableLockManager()); this.serverManager, balancer, null, null, master.getTableLockManager());
RegionStates regionStates = am.getRegionStates(); 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 // 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())) Mockito.anyInt(), (ServerName)Mockito.any(), Mockito.anyBoolean()))
.thenThrow(new RegionServerAbortedException("")); .thenThrow(new RegionServerAbortedException(""));
@ -1640,7 +1640,7 @@ public class TestAssignmentManager {
// assert that the we have FAILED_CLOSE for region state // assert that the we have FAILED_CLOSE for region state
assertEquals(State.FAILED_CLOSE, regionStates.getRegionState(REGIONINFO).getState()); assertEquals(State.FAILED_CLOSE, regionStates.getRegionState(REGIONINFO).getState());
assertEquals(SERVERNAME_B, regionStates.getRegionState(REGIONINFO).getServerName()); assertEquals(SERVERNAME_LIVE, regionStates.getRegionState(REGIONINFO).getServerName());
am.shutdown(); am.shutdown();
} }
@ -1665,10 +1665,10 @@ public class TestAssignmentManager {
}; };
RegionStates regionStates = am.getRegionStates(); 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 // mock that RS is expired, but not processed
Mockito.when(this.serverManager.isServerOnline(SERVERNAME_B)) Mockito.when(this.serverManager.isServerOnline(SERVERNAME_LIVE))
.thenReturn(false); .thenReturn(false);
// try to unassign the region // try to unassign the region
@ -1679,7 +1679,7 @@ public class TestAssignmentManager {
// try to assign the region before SSH // try to assign the region before SSH
am.regionPlans.put(REGIONINFO.getEncodedName(), am.regionPlans.put(REGIONINFO.getEncodedName(),
new RegionPlan(REGIONINFO, null, SERVERNAME_A)); new RegionPlan(REGIONINFO, null, SERVERNAME_DEAD));
am.assign(hri, true, false); am.assign(hri, true, false);
// assert that the we still have OFFLINE // assert that the we still have OFFLINE