Merge pull request #27136 from allencloud/add-lock-in-libcontainerd
add lock in libcontainerd client AddProcess of Windows
This commit is contained in:
commit
5e072a25f8
|
@ -670,7 +670,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
|
||||||
}
|
}
|
||||||
|
|
|
@ -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
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue