diff --git a/cmd/bitrot-streaming.go b/cmd/bitrot-streaming.go index b05fbe170..254bcdf65 100644 --- a/cmd/bitrot-streaming.go +++ b/cmd/bitrot-streaming.go @@ -139,8 +139,8 @@ func (b *streamingBitrotReader) ReadAt(buf []byte, offset int64) (int, error) { b.h.Write(buf) if !bytes.Equal(b.h.Sum(nil), b.hashBytes) { - err := &errHashMismatch{fmt.Sprintf("hashes do not match expected %s, got %s", - hex.EncodeToString(b.hashBytes), hex.EncodeToString(b.h.Sum(nil)))} + err := &errHashMismatch{fmt.Sprintf("Disk: %s - content hash does not match - expected %s, got %s", + b.disk, hex.EncodeToString(b.hashBytes), hex.EncodeToString(b.h.Sum(nil)))} logger.LogIf(GlobalContext, err) return 0, err } diff --git a/cmd/bitrot-whole.go b/cmd/bitrot-whole.go index fc016b56f..8fd6eca5a 100644 --- a/cmd/bitrot-whole.go +++ b/cmd/bitrot-whole.go @@ -17,6 +17,7 @@ package cmd import ( + "fmt" "hash" "io" @@ -35,12 +36,12 @@ type wholeBitrotWriter struct { func (b *wholeBitrotWriter) Write(p []byte) (int, error) { err := b.disk.AppendFile(b.volume, b.filePath, p) if err != nil { - logger.LogIf(GlobalContext, err) + logger.LogIf(GlobalContext, fmt.Errorf("Disk: %s returned %w", b.disk, err)) return 0, err } _, err = b.Hash.Write(p) if err != nil { - logger.LogIf(GlobalContext, err) + logger.LogIf(GlobalContext, fmt.Errorf("Disk: %s returned %w", b.disk, err)) return 0, err } return len(p), nil @@ -69,9 +70,7 @@ func (b *wholeBitrotReader) ReadAt(buf []byte, offset int64) (n int, err error) if b.buf == nil { b.buf = make([]byte, b.tillOffset-offset) if _, err := b.disk.ReadFile(b.volume, b.filePath, offset, b.buf, b.verifier); err != nil { - ctx := GlobalContext - logger.GetReqInfo(ctx).AppendTags("disk", b.disk.String()) - logger.LogIf(ctx, err) + logger.LogIf(GlobalContext, fmt.Errorf("Disk: %s returned %w", b.disk, err)) return 0, err } }