maxmustermann/minio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix delete bucket policies properly (#5540)

Browse source 
There was bug in previous PR where deleteBucketMetadata()
was never called, fix it correctly.
This commit is contained in:
Harshavardhana 2018-02-16 20:16:48 -08:00 committed by GitHub
parent d12bdd50ee
commit 03923947c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cmd/xl-sets.go
View file

@ -345,10 +345,12 @@ func (s *xlSets) MakeBucketWithLocation(bucket, location string) error {
errs := g.Wait()
// Upon even a single write quorum error we undo all previously created buckets.
for _, err := range errs {
if _, ok := err.(InsufficientWriteQuorum); ok {
undoMakeBucketSets(bucket, s.sets, errs)
if err != nil {
if _, ok := err.(InsufficientWriteQuorum); ok {
undoMakeBucketSets(bucket, s.sets, errs)
}
return err
}
return err
}
// Success.
@ -481,10 +483,12 @@ func (s *xlSets) DeleteBucket(bucket string) error {
// For any write quorum failure, we undo all the delete buckets operation
// by creating all the buckets again.
for _, err := range errs {
if _, ok := err.(InsufficientWriteQuorum); ok {
undoDeleteBucketSets(bucket, s.sets, errs)
if err != nil {
if _, ok := err.(InsufficientWriteQuorum); ok {
undoDeleteBucketSets(bucket, s.sets, errs)
}
return err
}
return err
}
// Delete all bucket metadata.