infrastructure/k8s-csi-s3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Although get a EOF error, we should still know it

Browse source
This commit is contained in:
boxjan 2021-04-09 21:45:52 +08:00
parent fa9ef78362
commit 8449c1e2e9
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkg/s3/client.go
View file

@ -157,10 +157,8 @@ func (client *s3Client) removeObjects(bucketName, prefix string) error {
errorCh := client.minio.RemoveObjects(client.ctx, bucketName, objectsCh, opts) errorCh := client.minio.RemoveObjects(client.ctx, bucketName, objectsCh, opts)
haveErrWhenRemoveObjects := false haveErrWhenRemoveObjects := false
for e := range errorCh { for e := range errorCh {
if e.Err.Error() != "EOF" { glog.Errorf("Failed to remove object %s, error: %s", e.ObjectName, e.Err)
glog.Errorf("Failed to remove object %s, error: %s", e.ObjectName, e.Err) haveErrWhenRemoveObjects = true
haveErrWhenRemoveObjects = true
}
} }
if haveErrWhenRemoveObjects { if haveErrWhenRemoveObjects {
return fmt.Errorf("Failed to remove all objects of bucket %s", bucketName) return fmt.Errorf("Failed to remove all objects of bucket %s", bucketName)
@ -212,10 +210,8 @@ func (client *s3Client) removeObjectsOneByOne(bucketName, prefix string) error {
haveErrWhenRemoveObjects := false haveErrWhenRemoveObjects := false
for e := range removeErrCh { for e := range removeErrCh {
if e.Err.Error() != "EOF" { glog.Errorf("Failed to remove object %s, error: %s", e.ObjectName, e.Err)
glog.Errorf("Failed to remove object %s, error: %s", e.ObjectName, e.Err) haveErrWhenRemoveObjects = true
haveErrWhenRemoveObjects = true
}
} }
if haveErrWhenRemoveObjects { if haveErrWhenRemoveObjects {
return fmt.Errorf("Failed to remove all objects of path %s", bucketName) return fmt.Errorf("Failed to remove all objects of path %s", bucketName)