From 9da49d0b993511c4e6e0f8f6192b258805475569 Mon Sep 17 00:00:00 2001 From: Odin Ugedal Date: Fri, 16 Aug 2019 20:32:17 +0200 Subject: [PATCH] Fix phrasing when referring to the freezer cgroup Signed-off-by: Odin Ugedal (cherry picked from commit 9c94e8260a82d6190204654e2285088c749930dc) Signed-off-by: Sebastiaan van Stijn --- api/swagger.yaml | 6 +++--- container/state.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/swagger.yaml b/api/swagger.yaml index 040ec0f2d2..a748d44d71 100644 --- a/api/swagger.yaml +++ b/api/swagger.yaml @@ -4875,7 +4875,7 @@ paths: Note that a running container can be _paused_. The `Running` and `Paused` booleans are not mutually exclusive: - When pausing a container (on Linux), the cgroups freezer is used to suspend + When pausing a container (on Linux), the freezer cgroup is used to suspend all processes in the container. Freezing the process requires the process to be running. As a result, paused containers are both `Running` _and_ `Paused`. @@ -5768,9 +5768,9 @@ paths: post: summary: "Pause a container" description: | - Use the cgroups freezer to suspend all processes in a container. + Use the freezer cgroup to suspend all processes in a container. - Traditionally, when suspending a process the `SIGSTOP` signal is used, which is observable by the process being suspended. With the cgroups freezer the process is unaware, and unable to capture, that it is being suspended, and subsequently resumed. + Traditionally, when suspending a process the `SIGSTOP` signal is used, which is observable by the process being suspended. With the freezer cgroup the process is unaware, and unable to capture, that it is being suspended, and subsequently resumed. operationId: "ContainerPause" responses: 204: diff --git a/container/state.go b/container/state.go index 7c2a1ec81c..be403ae7d3 100644 --- a/container/state.go +++ b/container/state.go @@ -17,7 +17,7 @@ import ( type State struct { sync.Mutex // Note that `Running` and `Paused` are not mutually exclusive: - // When pausing a container (on Linux), the cgroups freezer is used to suspend + // When pausing a container (on Linux), the freezer cgroup is used to suspend // all processes in the container. Freezing the process requires the process to // be running. As a result, paused containers are both `Running` _and_ `Paused`. Running bool