瀏覽代碼

Merge pull request #38685 from yongtang/go-vet

Fix go-vet issue
Sebastiaan van Stijn 6 年之前
父節點
當前提交
e6fe7f8f29
共有 1 個文件被更改,包括 1 次插入0 次删除
  1. 1 0
      cmd/dockerd/daemon.go

+ 1 - 0
cmd/dockerd/daemon.go

@@ -164,6 +164,7 @@ func (cli *DaemonCli) start(opts *daemonOptions) (err error) {
 	if cli.Config.ContainerdAddr == "" && runtime.GOOS != "windows" {
 	if cli.Config.ContainerdAddr == "" && runtime.GOOS != "windows" {
 		systemContainerdAddr, ok, err := systemContainerdRunning(cli.Config.IsRootless())
 		systemContainerdAddr, ok, err := systemContainerdRunning(cli.Config.IsRootless())
 		if err != nil {
 		if err != nil {
+			cancel()
 			return errors.Wrap(err, "could not determine whether the system containerd is running")
 			return errors.Wrap(err, "could not determine whether the system containerd is running")
 		}
 		}
 		if !ok {
 		if !ok {