ソースを参照

Merge pull request #27136 from allencloud/add-lock-in-libcontainerd

add lock in libcontainerd client AddProcess of Windows
Brian Goff 8 年 前
コミット
5e072a25f8
2 ファイル変更2 行追加1 行削除
  1. 1 1
      daemon/daemon.go
  2. 1 0
      libcontainerd/client_windows.go

+ 1 - 1
daemon/daemon.go

@@ -670,7 +670,7 @@ func NewDaemon(config *Config, registryService registry.Service, containerdRemot
 		return nil, err
 	}
 
-	// Plugin system initialization should happen before restore. Dont change order.
+	// Plugin system initialization should happen before restore. Do not change order.
 	if err := pluginInit(d, config, containerdRemote); err != nil {
 		return nil, err
 	}

+ 1 - 0
libcontainerd/client_windows.go

@@ -328,6 +328,7 @@ func (clnt *client) AddProcess(ctx context.Context, containerID, processFriendly
 
 	// Tell the engine to attach streams back to the client
 	if err := clnt.backend.AttachStreams(processFriendlyName, *iopipe); err != nil {
+		clnt.lock(containerID)
 		return err
 	}