Merge pull request #5229 from wzshiming/fix/log-cp-file

dmcgowan · web-flow · commit 0d569f8f4a9b · 2021-03-19T10:51:23.000-07:00
Fix error log when copy file
diff --git a/pkg/process/init.go b/pkg/process/init.go
@@ -441,7 +441,7 @@ func (p *Init) checkpoint(ctx context.Context, r *CheckpointConfig) error {
 	}, actions...); err != nil {
 		dumpLog := filepath.Join(p.Bundle, "criu-dump.log")
 		if cerr := copyFile(dumpLog, filepath.Join(work, "dump.log")); cerr != nil {
-			log.G(ctx).Error(err)
+			log.G(ctx).WithError(cerr).Error("failed to copy dump.log to criu-dump.log")
 		}
 		return fmt.Errorf("%s path= %s", criuError(err), dumpLog)
 	}

Original file line number	Diff line number	Diff line change
`@@ -441,7 +441,7 @@ func (p Init) checkpoint(ctx context.Context, r CheckpointConfig) error {`
`441`	`441`	`}, actions...); err != nil {`
`442`	`442`	`dumpLog := filepath.Join(p.Bundle, "criu-dump.log")`
`443`	`443`	`if cerr := copyFile(dumpLog, filepath.Join(work, "dump.log")); cerr != nil {`
`444`		`- log.G(ctx).Error(err)`
	`444`	`+ log.G(ctx).WithError(cerr).Error("failed to copy dump.log to criu-dump.log")`
`445`	`445`	`}`
`446`	`446`	`return fmt.Errorf("%s path= %s", criuError(err), dumpLog)`
`447`	`447`	`}`