GitList

Browse code

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

add lock in libcontainerd client AddProcess of Windows

Brian Goff authored on 2016/10/04 22:29:59
Showing 2 changed files

daemon/daemon.go index 04ef61b..64f961b 100644
libcontainerd/client_windows.go index 86dd9c6..1e833ce 100644

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

libcontainerd/client_windows.go

History View file @ 5e072a2

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

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