Skip to content

HBASE-30223 TestRegionMover2.testWithMergedRegions may merge disjoint… #8342

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

Open
Apache9 wants to merge 2 commits into
base: master
Choose a base branch
from
+53 −19
Open

HBASE-30223 TestRegionMover2.testWithMergedRegions may merge disjoint… #8342

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fcfa51
HBASE-30223 TestRegionMover2.testWithMergedRegions may merge disjoint…
Apache9 Jun 12, 2026
fc251b3
address review comments
Apache9 Jun 12, 2026
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
72 changes: 53 additions & 19 deletions hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionMover2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@
*/
package org.apache.hadoop.hbase.util;

import static org.junit.Assert.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
Expand All @@ -30,11 +35,15 @@
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.RegionInfo;
import org.apache.hadoop.hbase.client.RegionInfoBuilder;
import org.apache.hadoop.hbase.client.Table;
import org.apache.hadoop.hbase.client.TableDescriptor;
import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
import org.apache.hadoop.hbase.master.RegionState;
import org.apache.hadoop.hbase.master.assignment.AssignmentManager;
import org.apache.hadoop.hbase.master.assignment.TransitRegionStateProcedure;
import org.apache.hadoop.hbase.master.procedure.ProcedureSyncWait;
import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.regionserver.HRegionServer;
import org.apache.hadoop.hbase.testclassification.LargeTests;
Expand All @@ -44,7 +53,6 @@
import org.apache.hadoop.hbase.zookeeper.ZNodePaths;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Tag;
Expand Down Expand Up @@ -111,24 +119,50 @@ public void testWithMergedRegions() throws Exception {
List<Put> puts = createPuts(10000);
table.put(puts);
admin.flush(tableName);
HRegionServer regionServer = cluster.getRegionServer(0);
HRegionServer regionServer = null;
RegionInfo regionA = null;
RegionInfo regionB = null;
for (JVMClusterUtil.RegionServerThread rst : cluster.getRegionServerThreads()) {
HRegionServer rs = rst.getRegionServer();
for (HRegion region : rs.getRegions(tableName)) {
if (!region.getRegionInfo().isLast()) {
regionServer = rs;
regionA = region.getRegionInfo();
regionB = admin.getRegions(tableName).stream()
.filter(ri -> Bytes.equals(ri.getStartKey(), region.getRegionInfo().getEndKey()))
.findFirst().get();
break;
}
}
}
assertNotNull(regionServer);
// if regionB is not this regionServer, move it
AssignmentManager am = cluster.getMaster().getAssignmentManager();
while (
!regionServer.getServerName()
.equals(am.getRegionStates().getRegionState(regionB).getServerName())
) {
TransitRegionStateProcedure trsp =
am.createMoveRegionProcedure(regionB, regionServer.getServerName());
ProcedureSyncWait.submitAndWaitProcedure(cluster.getMaster().getMasterProcedureExecutor(),
trsp);
}

String rsName = regionServer.getServerName().getAddress().toString();
int numRegions = regionServer.getNumberOfOnlineRegions();
List<HRegion> hRegions = regionServer.getRegions().stream()
.filter(hRegion -> hRegion.getRegionInfo().getTable().equals(tableName))
.collect(Collectors.toList());
RegionMover.RegionMoverBuilder rmBuilder =
new RegionMover.RegionMoverBuilder(rsName, TEST_UTIL.getConfiguration()).ack(true)
.maxthreads(8);
try (RegionMover rm = rmBuilder.build()) {
LOG.debug("Unloading {}", regionServer.getServerName());
rm.unload();
Assertions.assertEquals(0, regionServer.getNumberOfOnlineRegions());
assertEquals(0, regionServer.getNumberOfOnlineRegions());
LOG.debug("Successfully Unloaded, now Loading");
admin.mergeRegionsAsync(new byte[][] { hRegions.get(0).getRegionInfo().getRegionName(),
hRegions.get(1).getRegionInfo().getRegionName() }, true).get(5, TimeUnit.SECONDS);
Assertions.assertTrue(rm.load());
Assertions.assertEquals(numRegions - 2, regionServer.getNumberOfOnlineRegions());
admin
.mergeRegionsAsync(new byte[][] { regionA.getRegionName(), regionB.getRegionName() }, true)
.get(15, TimeUnit.SECONDS);
assertTrue(rm.load());
assertEquals(numRegions - 2, regionServer.getNumberOfOnlineRegions());
}
}

Expand All @@ -155,7 +189,7 @@ public void testWithSplitRegions() throws Exception {
try (RegionMover rm = rmBuilder.build()) {
LOG.debug("Unloading {}", regionServer.getServerName());
rm.unload();
Assertions.assertEquals(0, regionServer.getNumberOfOnlineRegions());
assertEquals(0, regionServer.getNumberOfOnlineRegions());
LOG.debug("Successfully Unloaded, now Loading");
HRegion hRegion = hRegions.get(1);
if (hRegion.getRegionInfo().getStartKey().length == 0) {
Expand All @@ -172,8 +206,8 @@ public void testWithSplitRegions() throws Exception {
int midKey = startKey + (endKey - startKey) / 2;
admin.splitRegionAsync(hRegion.getRegionInfo().getRegionName(), Bytes.toBytes(midKey)).get(5,
TimeUnit.SECONDS);
Assertions.assertTrue(rm.load());
Assertions.assertEquals(numRegions - 1, regionServer.getNumberOfOnlineRegions());
assertTrue(rm.load());
assertEquals(numRegions - 1, regionServer.getNumberOfOnlineRegions());
}
}

Expand All @@ -197,11 +231,11 @@ public void testFailedRegionMove() throws Exception {
try (RegionMover rm = rmBuilder.build()) {
LOG.debug("Unloading {}", regionServer.getServerName());
rm.unload();
Assertions.assertEquals(0, regionServer.getNumberOfOnlineRegions());
assertEquals(0, regionServer.getNumberOfOnlineRegions());
LOG.debug("Successfully Unloaded, now Loading");
admin.offline(hRegions.get(0).getRegionInfo().getRegionName());
// loading regions will fail because of offline region
Assertions.assertFalse(rm.load());
assertFalse(rm.load());
}
}

Expand All @@ -217,11 +251,11 @@ public void testDeletedTable() throws Exception {
try (Admin admin = TEST_UTIL.getAdmin(); RegionMover rm = rmBuilder.build()) {
LOG.debug("Unloading {}", regionServer.getServerName());
rm.unload();
Assertions.assertEquals(0, regionServer.getNumberOfOnlineRegions());
assertEquals(0, regionServer.getNumberOfOnlineRegions());
LOG.debug("Successfully Unloaded, now delete table");
admin.disableTable(tableNameToDelete);
admin.deleteTable(tableNameToDelete);
Assertions.assertTrue(rm.load());
assertTrue(rm.load());
}
}

Expand Down Expand Up @@ -388,10 +422,10 @@ public void regionIsolationOperation(ServerName sourceServerName,
LOG.debug("Unloading {} except regions: {}", destinationRS.getServerName(),
listOfRegionIDsToIsolate);
rm.isolateRegions();
Assertions.assertEquals(numRegionsToIsolate, destinationRS.getNumberOfOnlineRegions());
assertEquals(numRegionsToIsolate, destinationRS.getNumberOfOnlineRegions());
List<HRegion> onlineRegions = destinationRS.getRegions();
for (int i = 0; i < numRegionsToIsolate; i++) {
Assertions.assertTrue(
assertTrue(
listOfRegionIDsToIsolate.contains(onlineRegions.get(i).getRegionInfo().getEncodedName()));
}
LOG.debug("Successfully Isolated {} regions: {} on {}", listOfRegionIDsToIsolate.size(),
Expand Down
Loading