HDDS-15493. Limit checkpoint-format parameterization in TestOMRatisSnapshots to transfer tests#10453
Open
chihsuan wants to merge 2 commits into
Open
HDDS-15493. Limit checkpoint-format parameterization in TestOMRatisSnapshots to transfer tests#10453chihsuan wants to merge 2 commits into
chihsuan wants to merge 2 commits into
Conversation
…apshots to transfer tests
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
Test-only change. HDDS-14721 made the whole
TestOMRatisSnapshotsclass parameterized (@ParameterizedClass) overozone.om.db.checkpoint.use.inode.based.transfer(false/true), so every test runs twice even though the parameter only affects the checkpoint transfer path.This PR keeps the v1/v2 parameterization only for the tests that actually exercise the transfer to speed up tests, by splitting the class:
testInstallSnapshotTestOMRatisSnapshotTransfer(new)max.total.sst.size+SnapshotMaxSizeInjector); not covered byTestOMBootstrap@Unhealthy("HDDS-13300")incremental testsTestOMRatisSnapshotTransfer(new)testInstallOldCheckpointFailure,testInstallCorruptedCheckpointFailureTestOMRatisSnapshotsinstallCheckpoint()directly, never download a tarball — parameter added no coveragetestInstallSnapshotWithClientWrite/ClientReadTestOMRatisSnapshotsTestOMBootstrap; their unique value (concurrent client IO during install) is format-agnostictestInstallSnapshotFromLeaderFailedDownloadCleanupSucceedsTestOMRatisSnapshotsNet: both checkpoint formats stay covered on every transfer path (multi-tarball by the new class, endpoint selection by
TestOMBootstrap), while the format-agnostic tests stop paying the 2× cluster-setup cost.The moved test bodies are byte-identical to the originals;
SnapshotMaxSizeInjectorand the incremental-tarball helpers move with them. The new class reuses the static helpers (checkSnapshot,createOzoneSnapshot,writeKeys) fromTestOMRatisSnapshots, following the existingTestOMBootstrappattern.For review: every retained line in
TestOMRatisSnapshotTransfermatches the masterTestOMRatisSnapshotssource except two mechanical adjustments the split requires: (1) thecheckSnapshot/createOzoneSnapshot/writeKeyswrappers call the shared statics via aTestOMRatisSnapshots.qualifier, and (2)confis a local ininit()rather than a field (the new class never reads it outside setup).What is the link to the Apache JIRA
https://issues.apache.org/jira/browse/HDDS-15493
How was this patch tested?
Full runs of both classes locally.
checkstylepasses on the module. Fork CI (build-branch) green: https://github.com/chihsuan/ozone/actions/runs/27064650428Speedup
From the
integration-omCI job, both on top of HDDS-10310 (so this isolates the effect of this change):TestOMRatisSnapshots(fully parameterized, v1 + v2)TestOMRatisSnapshots(single run)TestOMRatisSnapshotTransfer(v1 + v2)~118s faster (~29%), by no longer running the four format-agnostic tests twice.