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

add lock in libcontainerd client AddProcess

Browse source 
Signed-off-by: allencloud <allen.sun@daocloud.io>
(cherry picked from commit 278273bc16)
Signed-off-by: Victor Vieux <vieux@docker.com>
This commit is contained in:
allencloud 2016-10-02 00:22:23 +08:00 committed by Victor Vieux
parent 1c0d9a4a90
commit 9975fcbe1c
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libcontainerd/client_linux.go
View file

@ -101,6 +101,7 @@ func (clnt *client) AddProcess(ctx context.Context, containerID, processFriendly
clnt.unlock(containerID)
if err := clnt.backend.AttachStreams(processFriendlyName, *iopipe); err != nil {
clnt.lock(containerID)
return err
}
clnt.lock(containerID)

4
libcontainerd/types_linux.go
View file

@ -27,9 +27,9 @@ type Process struct {
Capabilities []string `json:"capabilities,omitempty"`
// Rlimits specifies rlimit options to apply to the process.
Rlimits []specs.Rlimit `json:"rlimits,omitempty"`
// ApparmorProfile specified the apparmor profile for the container.
// ApparmorProfile specifies the apparmor profile for the container.
ApparmorProfile *string `json:"apparmorProfile,omitempty"`
// SelinuxProcessLabel specifies the selinux context that the container process is run as.
// SelinuxLabel specifies the selinux context that the container process is run as.
SelinuxLabel *string `json:"selinuxLabel,omitempty"`
}