Merge pull request containerd#6272 from jonyhy96/fix-error-return

fuweid · web-flow · commit b6b8facf1556 · 2021-11-22T17:35:56.000+08:00
diff --git a/cmd/containerd/command/main.go b/cmd/containerd/command/main.go
@@ -219,7 +219,7 @@ can be used and modified as necessary as a custom configuration.`
 			return ctx.Err()
 		case r := <-chsrv:
 			if r.err != nil {
-				return err
+				return r.err
 			}
 			server = r.s
 		}

Original file line number	Diff line number	Diff line change
@@ -219,7 +219,7 @@ can be used and modified as necessary as a custom configuration.`
`219`	`219`	`return ctx.Err()`
`220`	`220`	`case r := <-chsrv:`
`221`	`221`	`if r.err != nil {`
`222`		`- return err`
	`222`	`+ return r.err`
`223`	`223`	`}`
`224`	`224`	`server = r.s`
`225`	`225`	`}`