Skip to content

HBASE-30190 Upgrade hbase-server to use junit5 Part21 (#8301) (#8309) #8318

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 2 commits into from
Jun 6, 2026
Merged

HBASE-30190 Upgrade hbase-server to use junit5 Part21 (#8301) (#8309) #8318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8457c59
HBASE-30190 Upgrade hbase-server to use junit5 Part21 (#8301) (#8309)
Apache9 Jun 5, 2026
778e1c6
fix
Apache9 Jun 5, 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
4 changes: 4 additions & 0 deletions hbase-common/src/test/java/org/apache/hadoop/hbase/TableNameTestExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ public TableName getTableName() {
return tableName;
}

public TableName getTableName(String suffix) {
return TableName.valueOf(tableName.getNameAsString() + suffix);
}

@Override
public void beforeEach(ExtensionContext context) {
tableName = TableName.valueOf(cleanUpTestName(context.getRequiredTestMethod().getName()));
Expand Down
1 change: 0 additions & 1 deletion hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/replication/TestVerifyReplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ public void setUp() throws Exception {

@BeforeAll
public static void setUpBeforeClass() throws Exception {

TableDescriptor peerTable =
TableDescriptorBuilder.newBuilder(peerTableName)
.setColumnFamily(
Expand Down
61 changes: 26 additions & 35 deletions ...rc/test/java/org/apache/hadoop/hbase/coprocessor/TestPassCustomCellViaRegionObserver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
*/
package org.apache.hadoop.hbase.coprocessor;

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

import java.io.IOException;
import java.nio.ByteBuffer;
Expand All @@ -32,7 +32,6 @@
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.CompareOperator;
import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.KeyValueUtil;
Expand All @@ -53,25 +52,17 @@
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.wal.WALEdit;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;

@Category({ CoprocessorTests.class, MediumTests.class })
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInfo;

@Tag(CoprocessorTests.TAG)
@Tag(MediumTests.TAG)
public class TestPassCustomCellViaRegionObserver {

@ClassRule
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestPassCustomCellViaRegionObserver.class);

@Rule
public TestName testName = new TestName();

private TableName tableName;
private Table table = null;

Expand All @@ -85,22 +76,22 @@ public class TestPassCustomCellViaRegionObserver {

private static final byte[] QUALIFIER_FROM_CP = Bytes.toBytes("QUALIFIER_FROM_CP");

@BeforeClass
@BeforeAll
public static void setupBeforeClass() throws Exception {
// small retry number can speed up the failed tests.
UTIL.getConfiguration().setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 2);
UTIL.startMiniCluster();
}

@AfterClass
@AfterAll
public static void tearDownAfterClass() throws Exception {
UTIL.shutdownMiniCluster();
}

@Before
public void clearTable() throws IOException {
@BeforeEach
public void clearTable(TestInfo testInfo) throws IOException {
RegionObserverImpl.COUNT.set(0);
tableName = TableName.valueOf(testName.getMethodName());
tableName = TableName.valueOf(testInfo.getTestMethod().get().getName());
if (table != null) {
table.close();
}
Expand Down Expand Up @@ -149,8 +140,8 @@ public void testMutation() throws Exception {
Delete delete = new Delete(ROW);
delete.addColumns(FAMILY, QUALIFIER);
table.delete(delete);
assertTrue(Arrays.asList(table.get(new Get(ROW)).rawCells()).toString(),
table.get(new Get(ROW)).isEmpty());
assertTrue(table.get(new Get(ROW)).isEmpty(),
Arrays.asList(table.get(new Get(ROW)).rawCells()).toString());
assertObserverHasExecuted();

assertTrue(table.checkAndPut(ROW, FAMILY, QUALIFIER, null, put));
Expand Down Expand Up @@ -186,21 +177,21 @@ private static void assertObserverHasExecuted() {
private static void assertResult(Result result, byte[] expectedValue) {
assertFalse(result.isEmpty());
for (Cell c : result.rawCells()) {
assertTrue(c.toString(), Bytes.equals(ROW, CellUtil.cloneRow(c)));
assertTrue(c.toString(), Bytes.equals(FAMILY, CellUtil.cloneFamily(c)));
assertTrue(c.toString(), Bytes.equals(expectedValue, CellUtil.cloneValue(c)));
assertTrue(Bytes.equals(ROW, CellUtil.cloneRow(c)), c.toString());
assertTrue(Bytes.equals(FAMILY, CellUtil.cloneFamily(c)), c.toString());
assertTrue(Bytes.equals(expectedValue, CellUtil.cloneValue(c)), c.toString());
}
}

private static void assertResult(Result result, byte[] expectedValue, byte[] expectedFromCp) {
assertFalse(result.isEmpty());
for (Cell c : result.rawCells()) {
assertTrue(c.toString(), Bytes.equals(ROW, CellUtil.cloneRow(c)));
assertTrue(c.toString(), Bytes.equals(FAMILY, CellUtil.cloneFamily(c)));
assertTrue(Bytes.equals(ROW, CellUtil.cloneRow(c)), c.toString());
assertTrue(Bytes.equals(FAMILY, CellUtil.cloneFamily(c)), c.toString());
if (Bytes.equals(QUALIFIER, CellUtil.cloneQualifier(c))) {
assertTrue(c.toString(), Bytes.equals(expectedValue, CellUtil.cloneValue(c)));
assertTrue(Bytes.equals(expectedValue, CellUtil.cloneValue(c)), c.toString());
} else if (Bytes.equals(QUALIFIER_FROM_CP, CellUtil.cloneQualifier(c))) {
assertTrue(c.toString(), Bytes.equals(expectedFromCp, CellUtil.cloneValue(c)));
assertTrue(Bytes.equals(expectedFromCp, CellUtil.cloneValue(c)), c.toString());
} else {
fail("No valid qualifier");
}
Expand Down
97 changes: 47 additions & 50 deletions ...server/src/test/java/org/apache/hadoop/hbase/favored/TestFavoredNodeAssignmentHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
*/
package org.apache.hadoop.hbase.favored;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;

Expand All @@ -33,10 +33,10 @@
import java.util.Set;
import java.util.SortedMap;
import java.util.TreeMap;
import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.TableNameTestExtension;
import org.apache.hadoop.hbase.client.RegionInfo;
import org.apache.hadoop.hbase.client.RegionInfoBuilder;
import org.apache.hadoop.hbase.master.RackManager;
Expand All @@ -45,33 +45,28 @@
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
import org.apache.hadoop.hbase.util.Triple;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.mockito.Mockito;

import org.apache.hbase.thirdparty.com.google.common.collect.Lists;
import org.apache.hbase.thirdparty.com.google.common.collect.Sets;

@Category({ MasterTests.class, MediumTests.class })
@Tag(MasterTests.TAG)
@Tag(MediumTests.TAG)
public class TestFavoredNodeAssignmentHelper {

@ClassRule
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestFavoredNodeAssignmentHelper.class);

private static List<ServerName> servers = new ArrayList<>();
private static Map<String, List<ServerName>> rackToServers = new HashMap<>();
private static RackManager rackManager = Mockito.mock(RackManager.class);

// Some tests have randomness, so we run them multiple times
private static final int MAX_ATTEMPTS = 100;

@Rule
public TestName name = new TestName();
@RegisterExtension
private final TableNameTestExtension tableNameExt = new TableNameTestExtension();

private static String getRack(int index) {
if (index < 10) {
Expand All @@ -85,7 +80,7 @@ private static String getRack(int index) {
}
}

@BeforeClass
@BeforeAll
public static void setupBeforeClass() throws Exception {
// Set up some server -> rack mappings
// Have three racks in the cluster with 10 hosts each.
Expand Down Expand Up @@ -301,7 +296,7 @@ public void testSecondaryAndTertiaryPlacementWithMoreThanOneServerInPrimaryRack(
// create regions
List<RegionInfo> regions = new ArrayList<>(regionCount);
for (int i = 0; i < regionCount; i++) {
regions.add(RegionInfoBuilder.newBuilder(TableName.valueOf(name.getMethodName()))
regions.add(RegionInfoBuilder.newBuilder(tableNameExt.getTableName())
.setStartKey(Bytes.toBytes(i)).setEndKey(Bytes.toBytes(i + 1)).build());
}
// place the regions
Expand Down Expand Up @@ -366,12 +361,15 @@ private void checkNumRegions(int regionCount, int firstRackSize, int secondRackS
regionMap.put(regionsOnRack1, 1);
regionMap.put(regionsOnRack2, 2);
regionMap.put(regionsOnRack3, 3);
assertEquals(printProportions(firstRackSize, secondRackSize, thirdRackSize, regionsOnRack1,
regionsOnRack2, regionsOnRack3), rackMap.get(firstRackSize), regionMap.get(regionsOnRack1));
assertEquals(printProportions(firstRackSize, secondRackSize, thirdRackSize, regionsOnRack1,
regionsOnRack2, regionsOnRack3), rackMap.get(secondRackSize), regionMap.get(regionsOnRack2));
assertEquals(printProportions(firstRackSize, secondRackSize, thirdRackSize, regionsOnRack1,
regionsOnRack2, regionsOnRack3), rackMap.get(thirdRackSize), regionMap.get(regionsOnRack3));
assertEquals(rackMap.get(firstRackSize), regionMap.get(regionsOnRack1),
printProportions(firstRackSize, secondRackSize, thirdRackSize, regionsOnRack1, regionsOnRack2,
regionsOnRack3));
assertEquals(rackMap.get(secondRackSize), regionMap.get(regionsOnRack2),
printProportions(firstRackSize, secondRackSize, thirdRackSize, regionsOnRack1, regionsOnRack2,
regionsOnRack3));
assertEquals(rackMap.get(thirdRackSize), regionMap.get(regionsOnRack3),
printProportions(firstRackSize, secondRackSize, thirdRackSize, regionsOnRack1, regionsOnRack2,
regionsOnRack3));
}

private String printProportions(int firstRackSize, int secondRackSize, int thirdRackSize,
Expand All @@ -392,7 +390,7 @@ public void testConstrainedPlacement() throws Exception {

List<RegionInfo> regions = new ArrayList<>(20);
for (int i = 0; i < 20; i++) {
regions.add(RegionInfoBuilder.newBuilder(TableName.valueOf(name.getMethodName()))
regions.add(RegionInfoBuilder.newBuilder(tableNameExt.getTableName())
.setStartKey(Bytes.toBytes(i)).setEndKey(Bytes.toBytes(i + 1)).build());
}
Map<ServerName, List<RegionInfo>> assignmentMap = new HashMap<ServerName, List<RegionInfo>>();
Expand Down Expand Up @@ -452,24 +450,24 @@ public void testGetRandomServerSingleRack() throws IOException {
// Check we don't get a bad node on any number of attempts
for (int attempts = 0; attempts < MAX_ATTEMPTS; attempts++) {
ServerName sn = helper.getOneRandomServer(rack, Sets.newHashSet());
assertTrue("Server:" + sn + " does not belong to list: " + servers, servers.contains(sn));
assertTrue(servers.contains(sn), "Server:" + sn + " does not belong to list: " + servers);
}

// Check skipServers multiple times when an invalid server is specified
Set<ServerName> skipServers =
Sets.newHashSet(ServerName.valueOf("invalidnode:1234", ServerName.NON_STARTCODE));
for (int attempts = 0; attempts < MAX_ATTEMPTS; attempts++) {
ServerName sn = helper.getOneRandomServer(rack, skipServers);
assertTrue("Server:" + sn + " does not belong to list: " + servers, servers.contains(sn));
assertTrue(servers.contains(sn), "Server:" + sn + " does not belong to list: " + servers);
}

// Check skipRack multiple times when an valid servers are specified
ServerName skipSN = ServerName.valueOf("foo1:1234", ServerName.NON_STARTCODE);
skipServers = Sets.newHashSet(skipSN);
for (int attempts = 0; attempts < MAX_ATTEMPTS; attempts++) {
ServerName sn = helper.getOneRandomServer(rack, skipServers);
assertNotEquals("Skip server should not be selected ", skipSN.getAddress(), sn.getAddress());
assertTrue("Server:" + sn + " does not belong to list: " + servers, servers.contains(sn));
assertNotEquals(skipSN.getAddress(), sn.getAddress(), "Skip server should not be selected");
assertTrue(servers.contains(sn), "Server:" + sn + " does not belong to list: " + servers);
}
}

Expand All @@ -490,8 +488,8 @@ public void testGetRandomServerMultiRack() throws IOException {
for (int attempts = 0; attempts < MAX_ATTEMPTS; attempts++) {
for (String rack : rackList) {
ServerName sn = helper.getOneRandomServer(rack, Sets.newHashSet());
assertTrue("Server:" + sn + " does not belong to rack servers: " + rackToServers.get(rack),
rackToServers.get(rack).contains(sn));
assertTrue(rackToServers.get(rack).contains(sn),
"Server:" + sn + " does not belong to rack servers: " + rackToServers.get(rack));
}
}

Expand All @@ -501,8 +499,8 @@ public void testGetRandomServerMultiRack() throws IOException {
for (int attempts = 0; attempts < MAX_ATTEMPTS; attempts++) {
for (String rack : rackList) {
ServerName sn = helper.getOneRandomServer(rack, skipServers);
assertTrue("Server:" + sn + " does not belong to rack servers: " + rackToServers.get(rack),
rackToServers.get(rack).contains(sn));
assertTrue(rackToServers.get(rack).contains(sn),
"Server:" + sn + " does not belong to rack servers: " + rackToServers.get(rack));
}
}

Expand All @@ -514,9 +512,9 @@ public void testGetRandomServerMultiRack() throws IOException {
for (int attempts = 0; attempts < MAX_ATTEMPTS; attempts++) {
for (String rack : rackList) {
ServerName sn = helper.getOneRandomServer(rack, skipServers);
assertFalse("Skip server should not be selected ", skipServers.contains(sn));
assertTrue("Server:" + sn + " does not belong to rack servers: " + rackToServers.get(rack),
rackToServers.get(rack).contains(sn));
assertFalse(skipServers.contains(sn), "Skip server should not be selected");
assertTrue(rackToServers.get(rack).contains(sn),
"Server:" + sn + " does not belong to rack servers: " + rackToServers.get(rack));
}
}
}
Expand All @@ -534,7 +532,7 @@ public void testGetFavoredNodes() throws IOException {
helper.initialize();
assertTrue(helper.canPlaceFavoredNodes());

RegionInfo region = RegionInfoBuilder.newBuilder(TableName.valueOf(name.getMethodName()))
RegionInfo region = RegionInfoBuilder.newBuilder(tableNameExt.getTableName())
.setStartKey(HConstants.EMPTY_START_ROW).setEndKey(HConstants.EMPTY_END_ROW).build();

for (int maxattempts = 0; maxattempts < MAX_ATTEMPTS; maxattempts++) {
Expand Down Expand Up @@ -569,13 +567,12 @@ public void testGenMissingFavoredNodeOneRack() throws IOException {
for (int attempts = 0; attempts < MAX_ATTEMPTS; attempts++) {
ServerName genSN = helper.generateMissingFavoredNode(fn, skipServers);
checkDuplicateFN(fn, genSN);
assertNotEquals("Generated FN should not match excluded one", snRack1SN3, genSN);
assertNotEquals(snRack1SN3, genSN, "Generated FN should not match excluded one");
}
}

@Test
public void testGenMissingFavoredNodeMultiRack() throws IOException {

ServerName snRack1SN1 = ServerName.valueOf("foo1:1234", ServerName.NON_STARTCODE);
ServerName snRack1SN2 = ServerName.valueOf("foo2:1234", ServerName.NON_STARTCODE);
ServerName snRack2SN1 = ServerName.valueOf("foo10:1234", ServerName.NON_STARTCODE);
Expand Down Expand Up @@ -612,22 +609,22 @@ public void testGenMissingFavoredNodeMultiRack() throws IOException {
ServerName genSN = helper.generateMissingFavoredNode(fn, skipServers);
checkDuplicateFN(fn, genSN);
checkFNRacks(fn, genSN);
assertNotEquals("Generated FN should not match excluded one", snRack2SN2, genSN);
assertNotEquals(snRack2SN2, genSN, "Generated FN should not match excluded one");
}
}

private void checkDuplicateFN(List<ServerName> fnList, ServerName genFN) {
Set<ServerName> favoredNodes = Sets.newHashSet(fnList);
assertNotNull("Generated FN can't be null", genFN);
assertNotNull(genFN, "Generated FN can't be null");
favoredNodes.add(genFN);
assertEquals("Did not find expected number of favored nodes",
FavoredNodeAssignmentHelper.FAVORED_NODES_NUM, favoredNodes.size());
assertEquals(FavoredNodeAssignmentHelper.FAVORED_NODES_NUM, favoredNodes.size(),
"Did not find expected number of favored nodes");
}

private void checkDuplicateFN(List<ServerName> fnList) {
Set<ServerName> favoredNodes = Sets.newHashSet(fnList);
assertEquals("Did not find expected number of favored nodes",
FavoredNodeAssignmentHelper.FAVORED_NODES_NUM, favoredNodes.size());
assertEquals(FavoredNodeAssignmentHelper.FAVORED_NODES_NUM, favoredNodes.size(),
"Did not find expected number of favored nodes");
}

private void checkFNRacks(List<ServerName> fnList, ServerName genFN) {
Expand All @@ -637,7 +634,7 @@ private void checkFNRacks(List<ServerName> fnList, ServerName genFN) {
for (ServerName sn : favoredNodes) {
racks.add(rackManager.getRack(sn));
}
assertTrue("FN should be spread atleast across 2 racks", racks.size() >= 2);
assertTrue(racks.size() >= 2, "FN should be spread atleast across 2 racks");
}

private void checkFNRacks(List<ServerName> fnList) {
Expand All @@ -646,6 +643,6 @@ private void checkFNRacks(List<ServerName> fnList) {
for (ServerName sn : favoredNodes) {
racks.add(rackManager.getRack(sn));
}
assertTrue("FN should be spread atleast across 2 racks", racks.size() >= 2);
assertTrue(racks.size() >= 2, "FN should be spread atleast across 2 racks");
}
}
Loading