Skip to content

HDDS-13776. Fail DirectoryPurge requests if previous snapshot ID validation fails. #9130

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 1 commit into from
Oct 23, 2025
Merged

HDDS-13776. Fail DirectoryPurge requests if previous snapshot ID validation fails. #9130

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions ...rc/main/java/org/apache/hadoop/ozone/om/request/key/OMDirectoriesPurgeRequestWithFSO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,11 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut
// Validating previous snapshot can ensure the chain hasn't changed.
UUID expectedPreviousSnapshotId = purgeDirsRequest.getExpectedPreviousSnapshotID().hasUuid()
? fromProtobuf(purgeDirsRequest.getExpectedPreviousSnapshotID().getUuid()) : null;
validatePreviousSnapshotId(fromSnapshotInfo, omMetadataManager.getSnapshotChainManager(),
expectedPreviousSnapshotId);
if (!validatePreviousSnapshotId(fromSnapshotInfo, omMetadataManager.getSnapshotChainManager(),
expectedPreviousSnapshotId)) {
return new OMDirectoriesPurgeResponseWithFSO(createErrorOMResponse(omResponse,
new OMException("Snapshot validation failed", OMException.ResultCodes.INVALID_REQUEST)));
}
Comment on lines +116 to +118
Copy link

Copilot AI Oct 9, 2025

Choose a reason for hiding this comment

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

The error message 'Snapshot validation failed' is too generic and doesn't provide enough context for debugging. Consider adding more specific information about what aspect of validation failed or why the request should be retried.

Suggested change
return new OMDirectoriesPurgeResponseWithFSO(createErrorOMResponse(omResponse,
new OMException("Snapshot validation failed", OMException.ResultCodes.INVALID_REQUEST)));
}
String actualPrevSnapshotId = (fromSnapshotInfo != null && fromSnapshotInfo.getPreviousSnapshot() != null)
? fromSnapshotInfo.getPreviousSnapshot().toString() : "null";
String errorMsg = String.format(
"Snapshot validation failed for fromSnapshot='%s': expected previousSnapshotId=%s, actual previousSnapshotId=%s",
fromSnapshot,
expectedPreviousSnapshotId != null ? expectedPreviousSnapshotId.toString() : "null",
actualPrevSnapshotId
);
return new OMDirectoriesPurgeResponseWithFSO(createErrorOMResponse(omResponse,
new OMException(errorMsg, OMException.ResultCodes.INVALID_REQUEST)));

Copilot uses AI. Check for mistakes.
}
} catch (IOException e) {
LOG.error("Error occurred while performing OMDirectoriesPurge. ", e);
Expand Down