From 9975fcbe1c831d045f548202f30856a77f8a102e Mon Sep 17 00:00:00 2001 From: allencloud Date: Sun, 2 Oct 2016 00:22:23 +0800 Subject: [PATCH] add lock in libcontainerd client AddProcess Signed-off-by: allencloud (cherry picked from commit 278273bc1699873304240a6eca342b54051e2f23) Signed-off-by: Victor Vieux --- libcontainerd/client_linux.go | 1 + libcontainerd/types_linux.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libcontainerd/client_linux.go b/libcontainerd/client_linux.go index b9e7415f38..ef504cad59 100644 --- a/libcontainerd/client_linux.go +++ b/libcontainerd/client_linux.go @@ -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) diff --git a/libcontainerd/types_linux.go b/libcontainerd/types_linux.go index 4f714a2329..a0bdb67296 100644 --- a/libcontainerd/types_linux.go +++ b/libcontainerd/types_linux.go @@ -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"` }