Skip to content

HDDS-8315. [Snapshot] Added unit tests for SnapshotDiffManager #4716

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
prashantpogde merged 5 commits into from
Jun 23, 2023
Merged

HDDS-8315. [Snapshot] Added unit tests for SnapshotDiffManager #4716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a205510
Added unit tests for SnapshotDiffManager
hemantk-12 Jun 22, 2023
1b9d45d
Rebased with upstream
hemantk-12 Jun 22, 2023
f1d02d8
Fixed checkstyle
hemantk-12 Jun 22, 2023
5c1496d
Fixed integ test
hemantk-12 Jun 22, 2023
b29977e
Enabled preFinalizationChecks
hemantk-12 Jun 22, 2023
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
2 changes: 1 addition & 1 deletion hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmSnapshot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ private void init() throws Exception {

// stop the deletion services so that keys can still be read
keyManager.stop();
// preFinalizationChecks();
preFinalizationChecks();
finalizeOMUpgrade();
counter = new AtomicInteger();
}
Expand Down
8 changes: 5 additions & 3 deletions hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmSnapshotManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo;
import org.apache.hadoop.ozone.om.helpers.SnapshotInfo;
import org.apache.hadoop.ozone.om.request.key.OMDirectoriesPurgeRequestWithFSO;
import org.apache.hadoop.ozone.om.request.key.OMKeyPurgeRequest;
import org.apache.hadoop.ozone.om.service.SnapshotDiffCleanupService;
import org.apache.hadoop.ozone.om.snapshot.SnapshotDiffObject;
import org.apache.hadoop.ozone.om.helpers.SnapshotDiffJob;
Expand Down Expand Up @@ -125,7 +127,7 @@ public final class OmSnapshotManager implements AutoCloseable {
* | fromSnapshotId-toSnapshotId | SnapshotDiffJob |
* |------------------------------------------------|
*/
private static final String SNAP_DIFF_JOB_TABLE_NAME =
public static final String SNAP_DIFF_JOB_TABLE_NAME =
"snap-diff-job-table";

/**
Expand All @@ -137,7 +139,7 @@ public final class OmSnapshotManager implements AutoCloseable {
* | jobId-index | DiffReportEntry |
* |--------------------------------|
*/
private static final String SNAP_DIFF_REPORT_TABLE_NAME =
public static final String SNAP_DIFF_REPORT_TABLE_NAME =
"snap-diff-report-table";

/**
Expand Down Expand Up @@ -359,7 +361,7 @@ public OmSnapshot load(@Nonnull String snapshotTableKey)
};
}

private CodecRegistry createCodecRegistryForSnapDiff() {
private static CodecRegistry createCodecRegistryForSnapDiff() {
final CodecRegistry.Builder registry = CodecRegistry.newBuilder();
// DiffReportEntry codec for Diff Report.
registry.addCodec(SnapshotDiffReportOzone.DiffReportEntry.class,
Expand Down
Loading