Skip to content

HBASE-30063 Upgrade hbase-server to use junit5 Part7#8126

Merged
liuxiaocs7 merged 2 commits intoapache:branch-2.5from
liuxiaocs7:HBASE-30063-branch-2.5
Apr 26, 2026
Merged

HBASE-30063 Upgrade hbase-server to use junit5 Part7#8126
liuxiaocs7 merged 2 commits intoapache:branch-2.5from
liuxiaocs7:HBASE-30063-branch-2.5

Conversation

@liuxiaocs7
Copy link
Copy Markdown
Member

@liuxiaocs7 liuxiaocs7 requested a review from Copilot April 24, 2026 07:42
@liuxiaocs7 liuxiaocs7 added the backport This PR is a back port of some issue or issues already committed to master label Apr 24, 2026
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Migrates a large set of hbase-server master-related tests on branch-2.5 further along the JUnit4 → JUnit5 transition for HBASE-30063, including assertion/annotation updates and a small refactor to share test logic.

Changes:

  • Replace JUnit4 annotations/rules/categories (@Before, @After, @Category, @RunWith, @ClassRule, etc.) with JUnit5 equivalents (@BeforeEach, @AfterAll, @Tag, @TestTemplate, extensions).
  • Update assertions to org.junit.jupiter.api.Assertions and adjust call signatures where needed (message parameter placement, etc.).
  • Refactor TestMasterRegionMutation{1,2} to reuse a new shared base (AbstractTestMasterRegionMutation).

Reviewed changes

Copilot reviewed 75 out of 75 changed files in this pull request and generated 5 comments.

Show a summary per file
File Description
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestWarmupRegion.java JUnit5 annotations + Tags + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestUnknownServers.java JUnit5 annotations + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitWALManager.java JUnit5 annotations + Tags + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitRegionWhileRSCrash.java JUnit5 annotations + Tags + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java JUnit5 annotations + Tags + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestShutdownWithNoRegionServer.java JUnit5 annotations + Tags migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestShutdownBackupMaster.java JUnit5 annotations + Tags + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestServerCrashProcedureStuck.java JUnit5 annotations + Tags migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestServerCrashProcedureCarryingMetaStuck.java JUnit5 annotations + Tags migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRoundRobinAssignmentOnRestartSplitWithoutZk.java Replace JUnit4 Category/ClassRule with JUnit5 Tags
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRoundRobinAssignmentOnRestart.java JUnit5 annotations + Tags + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRollingRestart.java Convert JUnit4 parameterized test to JUnit5 test template/parameter provider
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRetainAssignmentOnRestartSplitWithoutZk.java Replace JUnit4 Category/ClassRule with JUnit5 Tags
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRetainAssignmentOnRestart.java JUnit5 annotations + Tags + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartWithEmptyWALDirectory.java JUnit5 annotations + Tags + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionsRecoveryConfigManager.java JUnit5 annotations + Tags + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionsRecoveryChore.java JUnit5 annotations + Tags migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionState.java JUnit5 Tags + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlansWithThrottle.java JUnit5 annotations + Tags + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement2.java JUnit5 annotations + Tags + TestInfo usage for naming
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java JUnit5 annotations + Tags + Assertions migration (Ignore→Disabled)
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRecreateCluster.java JUnit5 annotations + Tags + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestNewStartedRegionServerVersion.java JUnit5 annotations + Tags + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMigrateAndMirrorMetaLocations.java JUnit5 annotations + Tags + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMetaShutdownHandler.java JUnit5 annotations + Tags + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMetaAssignmentWithStopMaster.java JUnit5 annotations + Tags + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMergeTableRegionsWhileRSCrash.java JUnit5 annotations + Tags + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java JUnit5 annotations + Tags + Assertions migration (Ignore→Disabled)
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterShutdown.java JUnit5 annotations + Tags + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterRestartAfterDisablingTable.java JUnit5 annotations + Tags + TestInfo usage for naming
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterRepairMode.java JUnit5 annotations + Tags + TestInfo usage for naming
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterRegionMutation2.java Switch to shared abstract base for master-region mutation tests
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterRegionMutation1.java Switch to shared abstract base for master-region mutation tests
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterQosFunction.java JUnit5 annotations + Tags migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterOperationsForRegionReplicas.java JUnit5 annotations + Tags + TestInfo usage for naming
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java JUnit5 annotations + Tags + Assertions migration (Ignore→Disabled)
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetricsWrapper.java JUnit5 annotations + Tags + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java JUnit5 annotations + Tags migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterHandlerFullWhenTransitRegion.java JUnit5 annotations + Tags migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFileSystemWithWALDir.java JUnit5 annotations + Tags + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFileSystemWithStoreFileTracking.java JUnit5 annotations + Tags + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFileSystem.java JUnit5 annotations + Tags + TestInfo usage for naming
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailoverBalancerPersistence.java JUnit5 Tags + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java JUnit5 Tags + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterDryRunBalancer.java JUnit5 annotations + Tags migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterCoprocessorServices.java JUnit5 annotations + Tags migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterChoreScheduled.java JUnit5 annotations + Tags + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterBalancerNPE.java JUnit5 annotations + Tags + TestInfo usage for naming
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterBalanceThrottling.java JUnit5 annotations + Tags migration (Ignore→Disabled)
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterAbortAndRSGotKilled.java JUnit5 annotations + Tags + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java JUnit5 annotations + Tags + TestInfo usage for naming
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestLoadProcedureError.java JUnit5 annotations + Tags + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestHMasterRPCException.java JUnit5 annotations + Tags + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestHMasterCommandLine.java JUnit5 Tags + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestGetReplicationLoad.java JUnit5 annotations + Tags + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestGetLastFlushedSequenceId.java JUnit5 annotations + Tags + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestGetInfoPort.java JUnit5 annotations + Tags + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDeadServer.java JUnit5 annotations + Tags + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDLSFSHLog.java Replace JUnit4 Category/ClassRule with JUnit5 Tags
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDLSAsyncFSWAL.java Replace JUnit4 Category/ClassRule with JUnit5 Tags
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestClusterStatusPublisher.java JUnit5 annotations + Tags + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestClusterRestartSplitWithoutZk.java Replace JUnit4 Category/ClassRule with JUnit5 Tags
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestClusterRestartFailoverSplitWithoutZk.java Replace JUnit4 Category/ClassRule with JUnit5 Tags
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestClusterRestartFailover.java JUnit5 Tags + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestClusterRestart.java JUnit5 Tags + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCloseAnOpeningRegion.java JUnit5 annotations + Tags migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestClockSkewDetection.java JUnit5 Tags + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestClientMetaServiceRPCs.java JUnit5 annotations + Tags + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestBalancer.java JUnit5 annotations + Tags + TestInfo usage for naming
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerMetrics.java JUnit5 annotations + Tags + TestInfo usage for naming
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAlwaysStandByHMaster.java Replace MiniClusterRule/ClassRule usage with JUnit5 MiniClusterExtension
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestActiveMasterManager.java JUnit5 annotations + Tags + Assertions migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/AbstractTestRestartCluster.java JUnit5 lifecycle annotations migration
hbase-server/src/test/java/org/apache/hadoop/hbase/master/AbstractTestMasterRegionMutation.java New shared base class for master-region mutation tests under JUnit5
hbase-server/src/test/java/org/apache/hadoop/hbase/master/AbstractTestDLS.java JUnit5 lifecycle annotations migration + TestInfo for naming

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestUnknownServers.java Outdated
@liuxiaocs7 liuxiaocs7 force-pushed the HBASE-30063-branch-2.5 branch from 64822df to a3f29ad Compare April 24, 2026 08:06
@liuxiaocs7 liuxiaocs7 merged commit 325f095 into apache:branch-2.5 Apr 26, 2026
30 of 36 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport This PR is a back port of some issue or issues already committed to master

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants