MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-17 01:10:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: CrawlAndGetDataUsage close pipe() before using a new one (#11600)

Browse Source 
also additionally make sure errors during deserializer closes
the reader with right error type such that Write() end
actually see the final error, this avoids a waitGroup usage
and waiting.
This commit is contained in:
Harshavardhana 2021-02-22 10:04:32 -08:00 committed by GitHub
parent 8778828a03
commit c31d2c3fdc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/data-usage-cache.go
View File

@ -485,7 +485,7 @@ type objectIO interface {
// Only backend errors are returned as errors. // Only backend errors are returned as errors.
// If the object is not found or unable to deserialize d is cleared and nil error is returned. // If the object is not found or unable to deserialize d is cleared and nil error is returned.
func (d *dataUsageCache) load(ctx context.Context, store objectIO, name string) error { func (d *dataUsageCache) load(ctx context.Context, store objectIO, name string) error {
r, err := store.GetObjectNInfo(ctx, dataUsageBucket, name, nil, http.Header{}, readLock, ObjectOptions{}) r, err := store.GetObjectNInfo(ctx, dataUsageBucket, name, nil, http.Header{}, noLock, ObjectOptions{})
if err != nil { if err != nil {
switch err.(type) { switch err.(type) {
case ObjectNotFound: case ObjectNotFound:

5
cmd/erasure.go
View File

@ -420,9 +420,10 @@ func (er erasureObjects) crawlAndGetDataUsage(ctx context.Context, buckets []Buc
cache, err = disk.CrawlAndGetDataUsage(ctx, cache) cache, err = disk.CrawlAndGetDataUsage(ctx, cache)
cache.Info.BloomFilter = nil cache.Info.BloomFilter = nil
if err != nil { if err != nil {
logger.LogIf(ctx, err) if !cache.Info.LastUpdate.IsZero() && cache.Info.LastUpdate.After(before) {
if cache.Info.LastUpdate.After(before) {
logger.LogIf(ctx, cache.save(ctx, er, cacheName)) logger.LogIf(ctx, cache.save(ctx, er, cacheName))
} else {
logger.LogIf(ctx, err)
} }
continue continue
} }

13
cmd/storage-rest-client.go
View File

@ -175,30 +175,25 @@ func (client *storageRESTClient) CrawlAndGetDataUsage(ctx context.Context, cache
go func() { go func() {
pw.CloseWithError(cache.serializeTo(pw)) pw.CloseWithError(cache.serializeTo(pw))
}() }()
defer pr.Close()
respBody, err := client.call(ctx, storageRESTMethodCrawlAndGetDataUsage, url.Values{}, pr, -1) respBody, err := client.call(ctx, storageRESTMethodCrawlAndGetDataUsage, url.Values{}, pr, -1)
defer http.DrainBody(respBody) defer http.DrainBody(respBody)
if err != nil { if err != nil {
pr.Close()
return cache, err return cache, err
} }
pr.Close()
var wg sync.WaitGroup
var newCache dataUsageCache var newCache dataUsageCache
var decErr error
pr, pw = io.Pipe() pr, pw = io.Pipe()
wg.Add(1)
go func() { go func() {
defer wg.Done() pr.CloseWithError(newCache.deserialize(pr))
decErr = newCache.deserialize(pr)
pr.CloseWithError(err)
}() }()
err = waitForHTTPStream(respBody, pw) err = waitForHTTPStream(respBody, pw)
pw.CloseWithError(err) pw.CloseWithError(err)
if err != nil { if err != nil {
return cache, err return cache, err
} }
wg.Wait() return newCache, nil
return newCache, decErr
} }
func (client *storageRESTClient) GetDiskID() (string, error) { func (client *storageRESTClient) GetDiskID() (string, error) {