diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.java index 958e1f3..0036cc5 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.java @@ -358,6 +358,13 @@ public class SplitTransactionImpl implements SplitTransaction { public PairOfSameType stepsBeforePONR(final Server server, final RegionServerServices services, boolean testing) throws IOException { + if (services != null) { + if (!services.reportRegionStateTransition(TransitionCode.READY_TO_SPLIT, + parent.getRegionInfo(), hri_a, hri_b)) { + throw new IOException("Failed to get ok from master to split " + + parent.getRegionInfo().getRegionNameAsString()); + } + } if (useCoordinatedStateManager(server)) { if (std == null) { std = @@ -367,12 +374,6 @@ public class SplitTransactionImpl implements SplitTransaction { ((BaseCoordinatedStateManager) server.getCoordinatedStateManager()) .getSplitTransactionCoordination().startSplitTransaction(parent, server.getServerName(), hri_a, hri_b); - } else if (services != null && !useZKForAssignment) { - if (!services.reportRegionStateTransition(TransitionCode.READY_TO_SPLIT, - parent.getRegionInfo(), hri_a, hri_b)) { - throw new IOException("Failed to get ok from master to split " - + parent.getRegionInfo().getRegionNameAsString()); - } } transition(SplitTransactionPhase.SET_SPLITTING);