summaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2018-02-19 11:05:43 -0500
committerAtomic Bot <atomic-devel@projectatomic.io>2018-02-22 14:49:36 +0000
commit86930c829ea27cb72a9d56f5a9dd6384f2844026 (patch)
treea356a50db3dac3a3b28de7f01a7781ced4af7948 /libpod
parent0b4c8fc2bb9813175b85e71aefcf285448632e14 (diff)
downloadpodman-86930c829ea27cb72a9d56f5a9dd6384f2844026.tar.gz
podman-86930c829ea27cb72a9d56f5a9dd6384f2844026.tar.bz2
podman-86930c829ea27cb72a9d56f5a9dd6384f2844026.zip
Add kill and stop for pods
Signed-off-by: Matthew Heon <matthew.heon@gmail.com> Closes: #361 Approved by: rhatdan
Diffstat (limited to 'libpod')
-rw-r--r--libpod/pod.go100
1 files changed, 98 insertions, 2 deletions
diff --git a/libpod/pod.go b/libpod/pod.go
index 6e4f67931..f2afd1e75 100644
--- a/libpod/pod.go
+++ b/libpod/pod.go
@@ -7,6 +7,7 @@ import (
"github.com/docker/docker/pkg/namesgenerator"
"github.com/docker/docker/pkg/stringid"
"github.com/pkg/errors"
+ "github.com/sirupsen/logrus"
)
// Pod represents a group of containers that may share namespaces
@@ -78,13 +79,104 @@ func (p *Pod) Start() error {
}
// Stop stops all containers within a pod that are not already stopped
+// Each container will use its own stop timeout
+// Only running containers will be stopped. Paused, stopped, or created
+// containers will be ignored.
+// If an error is encountered stopping any one container, no further containers
+// will be stopped, and an error will immediately be returned.
func (p *Pod) Stop() error {
- return ErrNotImplemented
+ p.lock.Lock()
+ defer p.lock.Unlock()
+
+ if !p.valid {
+ return ErrPodRemoved
+ }
+
+ allCtrs, err := p.runtime.state.PodContainers(p)
+ if err != nil {
+ return err
+ }
+
+ // We need to lock all the containers
+ for _, ctr := range allCtrs {
+ ctr.lock.Lock()
+ defer ctr.lock.Unlock()
+
+ if err := ctr.syncContainer(); err != nil {
+ return err
+ }
+ }
+
+ // Send a signal to all containers
+ for _, ctr := range allCtrs {
+ // Ignore containers that are not running
+ if ctr.state.State != ContainerStateRunning {
+ continue
+ }
+
+ if err := ctr.runtime.ociRuntime.stopContainer(ctr, ctr.config.StopTimeout); err != nil {
+ return errors.Wrapf(err, "error stopping container %s", ctr.ID())
+ }
+
+ // Sync container state to pick up return code
+ if err := ctr.runtime.ociRuntime.updateContainerStatus(ctr); err != nil {
+ return err
+ }
+
+ // Clean up storage to ensure we don't leave dangling mounts
+ if err := ctr.cleanupStorage(); err != nil {
+ return err
+ }
+
+ logrus.Debugf("Stopped container %s", ctr.ID())
+ }
+
+ return nil
}
// Kill sends a signal to all running containers within a pod
+// Signals will only be sent to running containers. Containers that are not
+// running will be ignored.
+// If an error is encountered signalling any one container, kill will stop
+// and immediately return an error, sending no further signals
func (p *Pod) Kill(signal uint) error {
- return ErrNotImplemented
+ p.lock.Lock()
+ defer p.lock.Unlock()
+
+ if !p.valid {
+ return ErrPodRemoved
+ }
+
+ allCtrs, err := p.runtime.state.PodContainers(p)
+ if err != nil {
+ return err
+ }
+
+ // We need to lock all the containers
+ for _, ctr := range allCtrs {
+ ctr.lock.Lock()
+ defer ctr.lock.Unlock()
+
+ if err := ctr.syncContainer(); err != nil {
+ return err
+ }
+ }
+
+ // Send a signal to all containers
+ for _, ctr := range allCtrs {
+ // Ignore containers that are not running
+ if ctr.state.State != ContainerStateRunning {
+ continue
+ }
+
+ if err := ctr.runtime.ociRuntime.killContainer(ctr, signal); err != nil {
+ return errors.Wrapf(err, "error killing container %s", ctr.ID())
+ }
+
+ logrus.Debugf("Killed container %s with signal %d", ctr.ID(), signal)
+ }
+
+ return nil
}
// HasContainer checks if a container is present in the pod
@@ -153,3 +245,7 @@ func (p *Pod) Status() (map[string]ContainerStatus, error) {
return status, nil
}
+
+// TODO add pod batching
+// Lock pod to avoid lock contention
+// Store and lock all containers (no RemoveContainer in batch guarantees cache will not become stale)