Skip to content

HBASE-28533 - On split procedure rollback revert parent region state … #5863

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Apache9 merged 1 commit into from
Apr 30, 2024
Merged

HBASE-28533 - On split procedure rollback revert parent region state … #5863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion ...er/src/main/java/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,8 @@ protected void rollbackState(final MasterProcedureEnv env, final SplitTableRegio
postRollBackSplitRegion(env);
break;
case SPLIT_TABLE_REGION_PREPARE:
break; // nothing to do
rollbackPrepareSplit(env);
break;
default:
throw new UnsupportedOperationException(this + " unhandled state=" + state);
}
Expand Down Expand Up @@ -572,6 +573,18 @@ public boolean prepareSplitRegion(final MasterProcedureEnv env) throws IOExcepti
return true;
}

/**
* Rollback prepare split region
* @param env MasterProcedureEnv
*/
private void rollbackPrepareSplit(final MasterProcedureEnv env) {
RegionStateNode parentRegionStateNode =
env.getAssignmentManager().getRegionStates().getRegionStateNode(getParentRegion());
if (parentRegionStateNode.getState() == State.SPLITTING) {
parentRegionStateNode.setState(State.OPEN);
}
}

/**
* Action before splitting region in a table.
* @param env MasterProcedureEnv
Expand Down
6 changes: 6 additions & 0 deletions ...rc/test/java/org/apache/hadoop/hbase/master/assignment/TestSplitTableRegionProcedure.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
import org.apache.hadoop.hbase.coprocessor.RegionCoprocessor;
import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
import org.apache.hadoop.hbase.coprocessor.RegionObserver;
import org.apache.hadoop.hbase.master.RegionState;
import org.apache.hadoop.hbase.master.procedure.MasterProcedureConstants;
import org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv;
import org.apache.hadoop.hbase.master.procedure.MasterProcedureTestingUtility;
Expand Down Expand Up @@ -242,6 +243,11 @@ public void testRollbackForSplitTableRegionWithReplica() throws Exception {
// There should not be any active OpenRegionProcedure
procExec.getActiveProceduresNoCopy()
.forEach(p -> assertFalse(p instanceof OpenRegionProcedure));

// Check that procedure rollback reverted parent region state to OPEN
AssignmentManager am = UTIL.getHBaseCluster().getMaster().getAssignmentManager();
RegionStateNode regionStateNode = am.getRegionStates().getRegionStateNode(regions[0]);
assertEquals(RegionState.State.OPEN, regionStateNode.getState());
}

@Test
Expand Down