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

Revert "HBASE-25339 Method parameter and member variable are duplicated in checkSplittable() of SplitTableRegionProcedure" 

This reverts commit c76145c505.
This commit is contained in:
Viraj Jasani 2020-11-30 19:48:58 +05:30
parent c76145c505
commit a8a35da73e
No known key found for this signature in database
GPG Key ID: B3D6C0B41C8ADFD5
1 changed files with 5 additions and 4 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/assignment/SplitTableRegionProcedure.java
View File

@ -110,7 +110,7 @@ public class SplitTableRegionProcedure
// we fail-fast on construction. There it skips the split with just a warning. // we fail-fast on construction. There it skips the split with just a warning.
checkOnline(env, regionToSplit); checkOnline(env, regionToSplit);
this.bestSplitRow = splitRow; this.bestSplitRow = splitRow;
checkSplittable(env, regionToSplit); checkSplittable(env, regionToSplit, bestSplitRow);
final TableName table = regionToSplit.getTable(); final TableName table = regionToSplit.getTable();
final long rid = getDaughterRegionIdTimestamp(regionToSplit); final long rid = getDaughterRegionIdTimestamp(regionToSplit);
this.daughterOneRI = RegionInfoBuilder.newBuilder(table) this.daughterOneRI = RegionInfoBuilder.newBuilder(table)
@ -173,9 +173,10 @@ public class SplitTableRegionProcedure
* Check whether the region is splittable * Check whether the region is splittable
* @param env MasterProcedureEnv * @param env MasterProcedureEnv
* @param regionToSplit parent Region to be split * @param regionToSplit parent Region to be split
* @param splitRow if splitRow is not specified, will first try to get bestSplitRow from RS
*/ */
private void checkSplittable(final MasterProcedureEnv env, private void checkSplittable(final MasterProcedureEnv env,
final RegionInfo regionToSplit) throws IOException { final RegionInfo regionToSplit, final byte[] splitRow) throws IOException {
// Ask the remote RS if this region is splittable. // Ask the remote RS if this region is splittable.
// If we get an IOE, report it along w/ the failure so can see why we are not splittable at // If we get an IOE, report it along w/ the failure so can see why we are not splittable at
// this time. // this time.
@ -226,12 +227,12 @@ public class SplitTableRegionProcedure
if (Bytes.equals(regionToSplit.getStartKey(), bestSplitRow)) { if (Bytes.equals(regionToSplit.getStartKey(), bestSplitRow)) {
throw new DoNotRetryIOException( throw new DoNotRetryIOException(
"Split row is equal to startkey: " + Bytes.toStringBinary(bestSplitRow)); "Split row is equal to startkey: " + Bytes.toStringBinary(splitRow));
} }
if (!regionToSplit.containsRow(bestSplitRow)) { if (!regionToSplit.containsRow(bestSplitRow)) {
throw new DoNotRetryIOException("Split row is not inside region key range splitKey:" + throw new DoNotRetryIOException("Split row is not inside region key range splitKey:" +
Bytes.toStringBinary(bestSplitRow) + " region: " + regionToSplit); Bytes.toStringBinary(splitRow) + " region: " + regionToSplit);
} }
} }