HDDS-15038. Clean up chunks before metadata for failed container import#10199
Open
devmadhuu wants to merge 1 commit intoapache:masterfrom
Open
HDDS-15038. Clean up chunks before metadata for failed container import#10199devmadhuu wants to merge 1 commit intoapache:masterfrom
devmadhuu wants to merge 1 commit intoapache:masterfrom
Conversation
…data to avoid chunks-only residual state.
adoroszlai
changed the title
ChenSammi
reviewed
May 8, 2026
| if (containerData.hasSchema(OzoneConsts.SCHEMA_V3)) { | ||
| BlockUtils.removeContainerFromDB(containerData, config); | ||
| } | ||
| FileUtils.deleteDirectory(new File(containerData.getMetadataPath())); |
Contributor
There was a problem hiding this comment.
@devmadhuu , we can first move the container directory to tmp, and then delete it. If any deletion in between failed, the residual will not impact normal flow, and it will be deleted on DN restart or next time this container is downloaded for import.
Contributor
Author
There was a problem hiding this comment.
Thanks @ChenSammi , this is better approach. I updated the patch to move the container directory to the deleted-container tmp area first, then delete it from there.
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
2 participants
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?
This PR handles failed container import cleanup on the DataNode.
KeyValueContainer.cleanupFailedImport()now deletes the chunks/ directory before deleting the metadata/ directory. If cleanup is interrupted or partially fails between child-directory deletions, the remaining on-disk state now preferentially preserves metadata instead of leaving a harder-to-diagnose chunks/-only residual directory.
A focused test was added to inject an import cleanup failure at metadata deletion and verify that chunks/ has already been removed while metadata/ remains.
What is the link to the Apache JIRA
https://issues.apache.org/jira/browse/HDDS-15038
How was this patch tested?
Added
TestKeyValueContainer#testFailedImportCleanupDeletesChunksBeforeMetadata