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

Remove logs from bitrot-streaming.go as erasure layer is already logging (#7603)

Browse Source
This commit is contained in:
Krishna Srinivas 2019-05-01 21:46:00 -07:00 committed by Harshavardhana
parent 3517f64d20
commit 43be00ea1b
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cmd/bitrot-streaming.go
View File

@ -41,13 +41,11 @@ func (b *streamingBitrotWriter) Write(p []byte) (int, error) {
b.h.Reset() b.h.Reset()
b.h.Write(p) b.h.Write(p)
hashBytes := b.h.Sum(nil) hashBytes := b.h.Sum(nil)
n, err := b.iow.Write(hashBytes) _, err := b.iow.Write(hashBytes)
if n != len(hashBytes) { if err != nil {
logger.LogIf(context.Background(), err)
return 0, err return 0, err
} }
n, err = b.iow.Write(p) return b.iow.Write(p)
return n, err
} }
func (b *streamingBitrotWriter) Close() error { func (b *streamingBitrotWriter) Close() error {
@ -75,11 +73,6 @@ func newStreamingBitrotWriter(disk StorageAPI, volume, filePath string, length i
totalFileSize = bitrotSumsTotalSize + length totalFileSize = bitrotSumsTotalSize + length
} }
err := disk.CreateFile(volume, filePath, totalFileSize, r) err := disk.CreateFile(volume, filePath, totalFileSize, r)
if err != nil {
reqInfo := (&logger.ReqInfo{}).AppendTags("storageDisk", disk.String())
ctx := logger.SetReqInfo(context.Background(), reqInfo)
logger.LogIf(ctx, err)
}
r.CloseWithError(err) r.CloseWithError(err)
close(bw.canClose) close(bw.canClose)
}() }()
@ -110,7 +103,7 @@ func (b *streamingBitrotReader) ReadAt(buf []byte, offset int64) (int, error) {
var err error var err error
if offset%b.shardSize != 0 { if offset%b.shardSize != 0 {
// Offset should always be aligned to b.shardSize // Offset should always be aligned to b.shardSize
logger.LogIf(context.Background(), errUnexpected) // Can never happen unless there are programmer bugs
return 0, errUnexpected return 0, errUnexpected
} }
if b.rc == nil { if b.rc == nil {
@ -119,25 +112,20 @@ func (b *streamingBitrotReader) ReadAt(buf []byte, offset int64) (int, error) {
streamOffset := (offset/b.shardSize)*int64(b.h.Size()) + offset streamOffset := (offset/b.shardSize)*int64(b.h.Size()) + offset
b.rc, err = b.disk.ReadFileStream(b.volume, b.filePath, streamOffset, b.tillOffset-streamOffset) b.rc, err = b.disk.ReadFileStream(b.volume, b.filePath, streamOffset, b.tillOffset-streamOffset)
if err != nil { if err != nil {
reqInfo := (&logger.ReqInfo{}).AppendTags("storageDisk", b.disk.String())
ctx := logger.SetReqInfo(context.Background(), reqInfo)
logger.LogIf(ctx, err)
return 0, err return 0, err
} }
} }
if offset != b.currOffset { if offset != b.currOffset {
logger.LogIf(context.Background(), errUnexpected) // Can never happen unless there are programmer bugs
return 0, errUnexpected return 0, errUnexpected
} }
b.h.Reset() b.h.Reset()
_, err = io.ReadFull(b.rc, b.hashBytes) _, err = io.ReadFull(b.rc, b.hashBytes)
if err != nil { if err != nil {
logger.LogIf(context.Background(), err)
return 0, err return 0, err
} }
_, err = io.ReadFull(b.rc, buf) _, err = io.ReadFull(b.rc, buf)
if err != nil { if err != nil {
logger.LogIf(context.Background(), err)
return 0, err return 0, err
} }
b.h.Write(buf) b.h.Write(buf)