0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add lock in libcontainerd client AddProcess of Windows

Browse source 
Signed-off-by: allencloud <allen.sun@daocloud.io>
This commit is contained in:
allencloud 2016-10-04 10:29:21 +08:00
parent 94cd7ed72d
commit 5143be0ccf
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/daemon.go
View file

@ -669,7 +669,7 @@ func NewDaemon(config *Config, registryService registry.Service, containerdRemot
return nil, err 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 { if err := pluginInit(d, config, containerdRemote); err != nil {
return nil, err return nil, err
} }

1
libcontainerd/client_windows.go
View file

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