kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17151 from justinsb/remove_versions 

s3 vfs: fix delete all versions to handle errors
This commit is contained in:
Kubernetes Prow Robot 2024-12-27 20:06:12 +01:00 committed by GitHub
parent 5c80c56fa4 5170257008
commit df6232e646
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
util/pkg/vfs/s3fs.go
View File

@ -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 {
@ -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