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

do not log checksum mismatch error, client received the error (#16246)

Browse Source
This commit is contained in:
Harshavardhana 2022-12-14 01:57:40 -08:00 committed by GitHub
parent 0159b56717
commit c73ea27ed7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/erasure-encode.go
View File

@ -22,6 +22,7 @@ import (
"io" "io"
"sync" "sync"
"github.com/minio/minio/internal/hash"
"github.com/minio/minio/internal/logger" "github.com/minio/minio/internal/logger"
) )
@ -83,9 +84,16 @@ func (e *Erasure) Encode(ctx context.Context, src io.Reader, writers []io.Writer
for { for {
var blocks [][]byte var blocks [][]byte
n, err := io.ReadFull(src, buf) n, err := io.ReadFull(src, buf)
if err != nil && err != io.EOF && err != io.ErrUnexpectedEOF { if err != nil {
logger.LogIf(ctx, err) if !IsErrIgnored(err, []error{
return 0, err io.EOF,
io.ErrUnexpectedEOF,
}...) {
if !hash.IsChecksumMismatch(err) {
logger.LogIf(ctx, err)
}
return 0, err
}
} }
eof := err == io.EOF || err == io.ErrUnexpectedEOF eof := err == io.EOF || err == io.ErrUnexpectedEOF
if n == 0 && total != 0 { if n == 0 && total != 0 {

11
internal/hash/errors.go
View File

@ -17,7 +17,10 @@
package hash package hash
import "fmt" import (
"errors"
"fmt"
)
// SHA256Mismatch - when content sha256 does not match with what was sent from client. // SHA256Mismatch - when content sha256 does not match with what was sent from client.
type SHA256Mismatch struct { type SHA256Mismatch struct {
@ -58,3 +61,9 @@ type ChecksumMismatch struct {
func (e ChecksumMismatch) Error() string { func (e ChecksumMismatch) Error() string {
return "Bad checksum: Want " + e.Want + " does not match calculated " + e.Got return "Bad checksum: Want " + e.Want + " does not match calculated " + e.Got
} }
// IsChecksumMismatch matches if 'err' is hash.ChecksumMismatch
func IsChecksumMismatch(err error) bool {
var herr ChecksumMismatch
return errors.As(err, &herr)
}