浏览代码

Fix cases where we are wrapping a nil error

This was using `errors.Wrap` when there was no error to wrap, meanwhile
we are supposed to be creating a new error.

Found this while investigating some log corruption issues and
unexpectedly getting a nil reader and a nil error from `getTailReader`.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 0a48d26fbcb33a84da7f767c2a62cae362df9505)
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
Brian Goff 1 年之前
父节点
当前提交
e2e670299f
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      daemon/logger/local/read.go

+ 1 - 1
daemon/logger/local/read.go

@@ -66,7 +66,7 @@ func getTailReader(ctx context.Context, r loggerutils.SizeReaderAt, req int) (io
 		}
 
 		if msgLen != binary.BigEndian.Uint32(buf) {
-			return nil, 0, errdefs.DataLoss(errors.Wrap(err, "log message header and footer indicate different message sizes"))
+			return nil, 0, errdefs.DataLoss(errors.New("log message header and footer indicate different message sizes"))
 		}
 
 		found++