From 5cd629adca39d9e25b558c6fcdf8147fa2f3902e Mon Sep 17 00:00:00 2001 From: Anis Elleuch Date: Tue, 12 Jul 2016 18:07:32 +0100 Subject: [PATCH] XL/fs: DeleteVol should not return error cleaning multipart dir for errVolumeNotFound (#2188) --- fs-v1.go | 2 +- xl-v1-bucket.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs-v1.go b/fs-v1.go index 59d26fe87..71e37058b 100644 --- a/fs-v1.go +++ b/fs-v1.go @@ -204,7 +204,7 @@ func (fs fsObjects) DeleteBucket(bucket string) error { return toObjectErr(err, bucket) } // Cleanup all the previously incomplete multiparts. - if err := cleanupDir(fs.storage, path.Join(minioMetaBucket, mpartMetaPrefix), bucket); err != nil { + if err := cleanupDir(fs.storage, path.Join(minioMetaBucket, mpartMetaPrefix), bucket); err != nil && err != errVolumeNotFound { return toObjectErr(err, bucket) } return nil diff --git a/xl-v1-bucket.go b/xl-v1-bucket.go index 084003fc9..148a9508f 100644 --- a/xl-v1-bucket.go +++ b/xl-v1-bucket.go @@ -247,7 +247,7 @@ func (xl xlObjects) DeleteBucket(bucket string) error { } // Cleanup all the previously incomplete multiparts. err = cleanupDir(disk, path.Join(minioMetaBucket, mpartMetaPrefix), bucket) - if err != nil { + if err != nil && err != errVolumeNotFound { dErrs[index] = err } }(index, disk)