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

pkg/fs: skip unnecessary os.Stat system call

This commit is contained in:
Brendan Ashworth 2016-03-06 23:54:43 -08:00
parent 0a0451a0fb
commit 7399d8ceaa
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/fs/fs-bucket.go
View File

@ -36,14 +36,11 @@ func (fs Filesystem) DeleteBucket(bucket string) *probe.Error {
} }
bucket = fs.denormalizeBucket(bucket) bucket = fs.denormalizeBucket(bucket)
bucketDir := filepath.Join(fs.path, bucket) bucketDir := filepath.Join(fs.path, bucket)
// Check if bucket exists. if e := os.Remove(bucketDir); e != nil {
if _, e := os.Stat(bucketDir); e != nil { // Error if there was no bucket in the first place.
if os.IsNotExist(e) { if os.IsNotExist(e) {
return probe.NewError(BucketNotFound{Bucket: bucket}) return probe.NewError(BucketNotFound{Bucket: bucket})
} }
return probe.NewError(e)
}
if e := os.Remove(bucketDir); e != nil {
// On windows the string is slightly different, handle it here. // On windows the string is slightly different, handle it here.
if strings.Contains(e.Error(), "directory is not empty") { if strings.Contains(e.Error(), "directory is not empty") {
return probe.NewError(BucketNotEmpty{Bucket: bucket}) return probe.NewError(BucketNotEmpty{Bucket: bucket})