GitList

Browse code

add lock in libcontainerd client AddProcess of Windows

Signed-off-by: allencloud <allen.sun@daocloud.io>

allencloud authored on 2016/10/04 11:29:21
Showing 2 changed files

daemon/daemon.go index 9911f3d..8e90378 100644
libcontainerd/client_windows.go index 86dd9c6..1e833ce 100644

@@ -669,7 +669,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
 	}

libcontainerd/client_windows.go

History View file @ 5143be0

@@ -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
+                     	}

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