MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-22 03:24:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

do not return error for usage-cache version v4 (#12276)

Browse Source
This commit is contained in:
Harshavardhana 2021-05-12 08:07:02 -07:00 committed by GitHub
parent a592d3be19
commit 57aed841dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -798,7 +798,7 @@ func (d *dataUsageCache) deserialize(r io.Reader) error {
if n != 1 { if n != 1 {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
} }
ver := b[0] ver := int(b[0])
switch ver { switch ver {
case dataUsageCacheVerV1: case dataUsageCacheVerV1:
return errors.New("cache version deprecated (will autoupdate)") return errors.New("cache version deprecated (will autoupdate)")
@ -900,6 +900,7 @@ func (d *dataUsageCache) deserialize(r io.Reader) error {
d.Cache[k] = e d.Cache[k] = e
} }
return nil
case dataUsageCacheVerCurrent: case dataUsageCacheVerCurrent:
// Zstd compressed. // Zstd compressed.
dec, err := zstd.NewReader(r, zstd.WithDecoderConcurrency(2)) dec, err := zstd.NewReader(r, zstd.WithDecoderConcurrency(2))
@ -908,8 +909,9 @@ func (d *dataUsageCache) deserialize(r io.Reader) error {
} }
defer dec.Close() defer dec.Close()
return d.DecodeMsg(msgp.NewReader(dec)) return d.DecodeMsg(msgp.NewReader(dec))
default:
return fmt.Errorf("dataUsageCache: unknown version: %d", ver)
} }
return fmt.Errorf("dataUsageCache: unknown version: %d", int(ver))
} }
// Trim this from start+end of hashes. // Trim this from start+end of hashes.