MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-12 15:33:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

Only enforce quota on success (#10339)

Browse Source 
We should only enforce quotas if no error has been returned.

firstErr is safe to access since all goroutines have exited at this point.

If `firstErr` hasn't been set by something else return the context error if cancelled.
This commit is contained in:
Klaus Post 2020-08-24 10:15:46 -07:00 committed by GitHub
parent 21e8440423
commit bc2ebe0021
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/erasure-zones.go
View File

@ -371,8 +371,10 @@ func (z *erasureZones) CrawlAndGetDataUsage(ctx context.Context, bf *bloomFilter
case v := <-updateCloser: case v := <-updateCloser:
update() update()
// Enforce quotas when all is done. // Enforce quotas when all is done.
for _, b := range allBuckets { if firstErr == nil {
enforceFIFOQuotaBucket(ctx, z, b.Name, allMerged.bucketUsageInfo(b.Name)) for _, b := range allBuckets {
enforceFIFOQuotaBucket(ctx, z, b.Name, allMerged.bucketUsageInfo(b.Name))
}
} }
close(v) close(v)
return return
@ -388,6 +390,9 @@ func (z *erasureZones) CrawlAndGetDataUsage(ctx context.Context, bf *bloomFilter
case updateCloser <- ch: case updateCloser <- ch:
<-ch <-ch
case <-ctx.Done(): case <-ctx.Done():
if firstErr == nil {
firstErr = ctx.Err()
}
} }
return firstErr return firstErr
} }