Skip to content

s3 vfs: fix delete all versions to handle errors #17151

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
merged 1 commit into from
Dec 27, 2024
Merged

s3 vfs: fix delete all versions to handle errors #17151

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
17 changes: 14 additions & 3 deletions util/pkg/vfs/s3fs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,16 @@ func (p *S3Path) RemoveAllVersions(ctx context.Context) error {
if err != nil {
return fmt.Errorf("error listing all versions of file %s: %v", p, err)
}
versions = append(versions, page.Versions...)
deleteMarkers = append(deleteMarkers, page.DeleteMarkers...)
for _, version := range page.Versions {
if aws.ToString(version.Key) == p.key {
versions = append(versions, version)
}
}
for _, marker := range page.DeleteMarkers {
if aws.ToString(marker.Key) == p.key {
deleteMarkers = append(deleteMarkers, marker)
}
}
}

if len(versions) == 0 && len(deleteMarkers) == 0 {
Expand Down Expand Up @@ -237,10 +245,13 @@ func (p *S3Path) RemoveAllVersions(ctx context.Context) error {

klog.V(8).Infof("removing %d file/marker versions\n", len(request.Delete.Objects))

_, err = client.DeleteObjects(ctx, request)
deleteResult, err := client.DeleteObjects(ctx, request)
if err != nil {
return fmt.Errorf("error removing %d file/marker versions: %v", len(request.Delete.Objects), err)
}
if len(deleteResult.Errors) > 0 {
return fmt.Errorf("error removing file/marker versions: %v", deleteResult.Errors)
}
}

return nil
Expand Down
Loading