Use named error return for service#StartShim

tedyu · dmcgowan · commit ea04599edfee · 2020-11-30T10:17:29.000-08:00
Signed-off-by: Ted Yu &lt;yuzhihong@gmail.com&gt;
diff --git a/runtime/v2/runc/v2/service.go b/runtime/v2/runc/v2/service.go
@@ -158,7 +158,7 @@ func readSpec() (*spec, error) {
 	return &s, nil
 }
 
-func (s *service) StartShim(ctx context.Context, id, containerdBinary, containerdAddress, containerdTTRPCAddress string) (string, error) {
+func (s *service) StartShim(ctx context.Context, id, containerdBinary, containerdAddress, containerdTTRPCAddress string) (_ string, retErr error) {
 	cmd, err := newCommand(ctx, id, containerdBinary, containerdAddress, containerdTTRPCAddress)
 	if err != nil {
 		return "", err
@@ -201,7 +201,7 @@ func (s *service) StartShim(ctx context.Context, id, containerdBinary, container
 		return "", err
 	}
 	defer func() {
-		if err != nil {
+		if retErr != nil {
 			cmd.Process.Kill()
 		}
 	}()

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ func readSpec() (*spec, error) {`
`158`	`158`	`return &s, nil`
`159`	`159`	`}`
`160`	`160`
`161`		`-func (s *service) StartShim(ctx context.Context, id, containerdBinary, containerdAddress, containerdTTRPCAddress string) (string, error) {`
	`161`	`+func (s *service) StartShim(ctx context.Context, id, containerdBinary, containerdAddress, containerdTTRPCAddress string) (_ string, retErr error) {`
`162`	`162`	`cmd, err := newCommand(ctx, id, containerdBinary, containerdAddress, containerdTTRPCAddress)`
`163`	`163`	`if err != nil {`
`164`	`164`	`return "", err`
`@@ -201,7 +201,7 @@ func (s *service) StartShim(ctx context.Context, id, containerdBinary, container`
`201`	`201`	`return "", err`
`202`	`202`	`}`
`203`	`203`	`defer func() {`
`204`		`- if err != nil {`
	`204`	`+ if retErr != nil {`
`205`	`205`	`cmd.Process.Kill()`
`206`	`206`	`}`
`207`	`207`	`}()`