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: improve error handling in metacache (#10965)

Browse Source
This commit is contained in:
Harshavardhana 2020-11-25 01:11:22 -08:00 committed by GitHub
parent 7742238495
commit 31e6f60847
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
cmd/metacache-set.go
View File

@ -426,14 +426,10 @@ func (er *erasureObjects) streamMetadataParts(ctx context.Context, o listPathOpt
} }
} }
if fi.Deleted {
return entries, errFileNotFound
}
partN, err := o.findFirstPart(fi) partN, err := o.findFirstPart(fi)
switch err { switch {
case nil: case err == nil:
case io.ErrUnexpectedEOF: case errors.Is(err, io.ErrUnexpectedEOF):
if retries == 10 { if retries == 10 {
err := o.checkMetacacheState(ctx, rpc) err := o.checkMetacacheState(ctx, rpc)
if err != nil { if err != nil {
@ -444,7 +440,7 @@ func (er *erasureObjects) streamMetadataParts(ctx context.Context, o listPathOpt
retries++ retries++
time.Sleep(retryDelay) time.Sleep(retryDelay)
continue continue
case io.EOF: case errors.Is(err, io.EOF):
return entries, io.EOF return entries, io.EOF
} }
@ -498,9 +494,6 @@ func (er *erasureObjects) streamMetadataParts(ctx context.Context, o listPathOpt
return entries, io.EOF return entries, io.EOF
} }
} }
if fi.Deleted {
return entries, io.ErrUnexpectedEOF
}
} }
buf.Reset() buf.Reset()
err := er.getObjectWithFileInfo(ctx, minioMetaBucket, o.objectPath(partN), 0, fi.Size, &buf, fi, metaArr, onlineDisks) err := er.getObjectWithFileInfo(ctx, minioMetaBucket, o.objectPath(partN), 0, fi.Size, &buf, fi, metaArr, onlineDisks)
@ -529,29 +522,29 @@ func (er *erasureObjects) streamMetadataParts(ctx context.Context, o listPathOpt
entries.truncate(o.Limit) entries.truncate(o.Limit)
return entries, nil return entries, nil
} }
switch err { if err == nil {
case io.EOF:
// We finished at the end of the block.
// And should not expect any more results.
bi, err := getMetacacheBlockInfo(fi, partN)
logger.LogIf(ctx, err)
if err != nil || bi.EOS {
// We are done and there are no more parts.
return entries, io.EOF
}
if bi.endedPrefix(o.Prefix) {
// Nothing more for prefix.
return entries, io.EOF
}
partN++
retries = 0
case nil:
// We stopped within the listing, we are done for now... // We stopped within the listing, we are done for now...
return entries, nil return entries, nil
default: }
if !errors.Is(err, io.EOF) {
logger.LogIf(ctx, err) logger.LogIf(ctx, err)
return entries, err return entries, err
} }
// We finished at the end of the block.
// And should not expect any more results.
bi, err := getMetacacheBlockInfo(fi, partN)
logger.LogIf(ctx, err)
if err != nil || bi.EOS {
// We are done and there are no more parts.
return entries, io.EOF
}
if bi.endedPrefix(o.Prefix) {
// Nothing more for prefix.
return entries, io.EOF
}
partN++
retries = 0
} }
} }
} }