Skip to content

HDDS-13554. Clean up snapshot local YAML file on Snapshot purge. #8939

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
jojochuang merged 2 commits into from
Aug 19, 2025
Merged

HDDS-13554. Clean up snapshot local YAML file on Snapshot purge. #8939

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
cd79634
HDDS-13554. Cleaning up snapshot local YAML file on Snapshot purge.
Aug 11, 2025
1ddc194
HDDS-13554. Updated unit test.
Aug 12, 2025
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
9 changes: 7 additions & 2 deletions ...r/src/main/java/org/apache/hadoop/ozone/om/response/snapshot/OMSnapshotPurgeResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@
import com.google.common.annotations.VisibleForTesting;
import jakarta.annotation.Nonnull;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.List;
import java.util.Map;
import org.apache.commons.io.FileUtils;
Expand Down Expand Up @@ -125,11 +127,14 @@ private void deleteCheckpointDirectory(OMMetadataManager omMetadataManager,
boolean acquiredSnapshotLock = omLockDetails.isLockAcquired();
if (acquiredSnapshotLock) {
Path snapshotDirPath = OmSnapshotManager.getSnapshotPath(omMetadataManager, snapshotInfo);
Path snapshotLocalDataPath = Paths.get(
OmSnapshotManager.getSnapshotLocalPropertyYamlPath(omMetadataManager, snapshotInfo));
try {
FileUtils.deleteDirectory(snapshotDirPath.toFile());
Files.deleteIfExists(snapshotLocalDataPath);
Copy link

Copilot AI Aug 18, 2025

Choose a reason for hiding this comment

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

The YAML file deletion should be included in the same try-catch block as the directory deletion to ensure consistent error handling and logging for both operations.

Copilot uses AI. Check for mistakes.
} catch (IOException ex) {
LOG.error("Failed to delete snapshot directory {} for snapshot {}",
snapshotDirPath, snapshotInfo.getTableKey(), ex);
LOG.error("Failed to delete snapshot directory {} and/or local data file {} for snapshot {}",
snapshotDirPath, snapshotLocalDataPath, snapshotInfo.getTableKey(), ex);
} finally {
omMetadataManager.getLock().releaseWriteLock(SNAPSHOT_DB_LOCK, snapshotInfo.getSnapshotId().toString());
}
Expand Down
12 changes: 12 additions & 0 deletions ...va/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotPurgeRequestAndResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
Expand All @@ -46,6 +47,7 @@
import org.apache.hadoop.hdds.utils.db.CodecException;
import org.apache.hadoop.hdds.utils.db.Table;
import org.apache.hadoop.ozone.om.OmMetadataManagerImpl;
import org.apache.hadoop.ozone.om.OmSnapshotManager;
import org.apache.hadoop.ozone.om.SnapshotChainManager;
import org.apache.hadoop.ozone.om.helpers.SnapshotInfo;
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
Expand Down Expand Up @@ -157,6 +159,14 @@ public void testValidateAndUpdateCache() throws Exception {

List<String> snapshotDbKeysToPurge = createSnapshots(10);
assertFalse(getOmMetadataManager().getSnapshotInfoTable().isEmpty());

// Check if all the checkpoints are created.
for (Path checkpoint : checkpointPaths) {
assertTrue(Files.exists(checkpoint));
assertTrue(Files.exists(Paths.get(
OmSnapshotManager.getSnapshotLocalPropertyYamlPath(checkpoint))));
}

OMRequest snapshotPurgeRequest = createPurgeKeysRequest(
snapshotDbKeysToPurge);

Expand All @@ -180,6 +190,8 @@ public void testValidateAndUpdateCache() throws Exception {
// Check if all the checkpoints are cleared.
for (Path checkpoint : checkpointPaths) {
assertFalse(Files.exists(checkpoint));
assertFalse(Files.exists(Paths.get(
OmSnapshotManager.getSnapshotLocalPropertyYamlPath(checkpoint))));
}
assertEquals(initialSnapshotPurgeCount + 1, getOmSnapshotIntMetrics().getNumSnapshotPurges());
assertEquals(initialSnapshotPurgeFailCount, getOmSnapshotIntMetrics().getNumSnapshotPurgeFails());
Expand Down