MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-20 18:44:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add update retry limit and compare error by string instead (#10776)

Browse Source
This commit is contained in:
Klaus Post 2020-10-28 13:19:53 -07:00 committed by GitHub
parent be7f67268d
commit bfc36aed89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/metacache-server-sets.go
View File

@ -197,7 +197,7 @@ func (z *erasureServerSets) listPath(ctx context.Context, o listPathOptions) (en
allAtEOF = false allAtEOF = false
continue continue
} }
if err == io.EOF { if err.Error() == io.EOF.Error() {
continue continue
} }
logger.LogIf(ctx, err) logger.LogIf(ctx, err)

20
cmd/metacache-set.go
View File

@ -319,7 +319,7 @@ func (r *metacacheReader) filter(o listPathOptions) (entries metaCacheEntriesSor
entries.o = append(entries.o, entry) entries.o = append(entries.o, entry)
return entries.len() < o.Limit return entries.len() < o.Limit
}) })
if err == io.EOF || pastPrefix || r.nextEOF() { if (err != nil && err.Error() == io.EOF.Error()) || pastPrefix || r.nextEOF() {
return entries, io.EOF return entries, io.EOF
} }
return entries, err return entries, err
@ -632,6 +632,9 @@ func (er *erasureObjects) listPath(ctx context.Context, o listPathOptions) (entr
} }
}() }()
const retryDelay = 200 * time.Millisecond
const maxTries = 10
// Write results to disk. // Write results to disk.
bw := newMetacacheBlockWriter(cacheCh, func(b *metacacheBlock) error { bw := newMetacacheBlockWriter(cacheCh, func(b *metacacheBlock) error {
if debugPrint { if debugPrint {
@ -654,13 +657,24 @@ func (er *erasureObjects) listPath(ctx context.Context, o listPathOptions) (entr
return nil return nil
} }
// Update block 0 metadata. // Update block 0 metadata.
var retries int
for { for {
err := er.updateObjectMeta(ctx, minioMetaBucket, o.objectPath(0), b.headerKV(), ObjectOptions{}) err := er.updateObjectMeta(ctx, minioMetaBucket, o.objectPath(0), b.headerKV(), ObjectOptions{})
if err == nil { if err == nil {
break break
} }
logger.LogIf(ctx, err) switch err.(type) {
time.Sleep(100 * time.Millisecond) case ObjectNotFound:
return err
case InsufficientReadQuorum:
default:
logger.LogIf(ctx, err)
}
if retries >= maxTries {
return err
}
retries++
time.Sleep(retryDelay)
} }
return nil return nil
}) })