MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-23 02:57:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Implement delete bucket properly with proper error handlings

Browse Source
This commit is contained in:
Harshavardhana
2015-10-17 00:00:50 -07:00
parent 7a4ca0b9c2
commit d534fc5a4f
2 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/fs/fs.go
View File

@@ -17,7 +17,6 @@
package fs
import (
"errors"
"os"
"runtime"
"strings"
@@ -94,21 +93,16 @@ func (fs API) DeleteBucket(bucket string) *probe.Error {
if _, err := os.Stat(bucketDir); os.IsNotExist(err) {
return probe.NewError(BucketNotFound{Bucket: bucket})
}
var errNotEmpty = errors.New("Directory Not empty")
isDirNotEmpty := func(fp string, fl os.FileInfo, err error) error {
if fl.Mode().IsRegular() || fl.Mode()&os.ModeSymlink == os.ModeSymlink {
return errNotEmpty
}
return ErrSkipDir
}
err := WalkUnsorted(bucketDir, isDirNotEmpty)
if err != nil {
if err == errNotEmpty {
if err := RemoveAllDirs(bucketDir); err != nil {
if err == ErrDirNotEmpty || strings.Contains(err.Error(), "directory not empty") {
return probe.NewError(BucketNotEmpty{Bucket: bucket})
}
return probe.NewError(err)
}
if err := os.Remove(bucketDir); err != nil {
if strings.Contains(err.Error(), "directory not empty") {
return probe.NewError(BucketNotEmpty{Bucket: bucket})
}
return probe.NewError(err)
}
return nil