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

HBASE-17044 Fix merge failed before creating merged region leaves meta inconsistent

This commit is contained in:
Andrew Purtell 2016-11-14 12:28:19 -08:00
parent 6c1ceaf11a
commit dcf03b32f4
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
View File

@ -2700,9 +2700,16 @@ public class AssignmentManager {
+ ", a=" + rs_a + ", b=" + rs_b;
}
// Always bring the children back online. Even if they are not offline
// there's no harm in making them online again.
regionOnline(a, serverName);
regionOnline(b, serverName);
regionOffline(hri);
// Only offline the merging region if it is known to exist.
RegionState rs_p = regionStates.getRegionState(hri);
if (rs_p != null) {
regionOffline(hri);
}
if (getTableStateManager().isTableState(hri.getTable(),
TableState.State.DISABLED, TableState.State.DISABLING)) {