snapshot: preserve normal snapshots during cleanup #2127
Merged
Conversation
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
ktock
reviewed
Sep 18, 2025
snapshot/snapshot.go
Outdated
| if err := storage.WalkInfo(ctx, func(ctx context.Context, info snapshots.Info) error { | ||
| if _, ok := info.Labels[remoteLabel]; !ok { | ||
| if id, exists := keyToID[info.Name]; exists { | ||
| delete(ids, id) |
There was a problem hiding this comment.
Instead of giving two different meanings to ids depending on cleanupCommited value, can you just add a remoteSnapshotNames := make(map[string]struct{}) which caches all remote snapshot names and do something like the following in the loop at L459?
for _, d := range dirs {
if !cleanupCommitted {
if _, ok := ids[d]; ok {
continue
}
} else {
if _, ok := remoteSnapshotNames[d]; !ok {
continue // do not delete local snapshots
}
}
cleanup = append(cleanup, filepath.Join(snapshotDir, d))
}There was a problem hiding this comment.
Sure. I'll make the change.
ChengyuZhu6
force-pushed
the
cleanup
branch
2 times, most recently
from
0c8c930 to
648a91a
Compare
|
@ChengyuZhu6 Could you rebase the patch to pass CI? |
Sure. |
This commit modifies getCleanupDirectories() to: - Only clean up remote snapshots (those with remoteLabel) during Close() - Preserve normal snapshot directories and their content - Ensure normal snapshots remain functional after restart Signed-off-by: ChengyuZhu6 <[email protected]>
ChengyuZhu6
force-pushed
the
cleanup
branch
from
648a91a to
def662c
Compare
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.
This commit modifies getCleanupDirectories() to:
Fixes: #2126