summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatej Vasek <mvasek@redhat.com>2021-02-01 20:21:03 +0100
committerMatej Vasek <mvasek@redhat.com>2021-02-03 21:49:09 +0100
commit570e1587dde267adea7fe460086dffee6aec83a4 (patch)
tree8b7570ae70bab43ceea4709c672adb3bc82cf80b
parent4e1bcf30f3a519490f58d66bc0aef16676f61ae8 (diff)
downloadpodman-570e1587dde267adea7fe460086dffee6aec83a4.tar.gz
podman-570e1587dde267adea7fe460086dffee6aec83a4.tar.bz2
podman-570e1587dde267adea7fe460086dffee6aec83a4.zip
Improve container libpod.Wait*() functions
Signed-off-by: Matej Vasek <mvasek@redhat.com>
-rw-r--r--libpod/container_api.go111
-rw-r--r--libpod/container_internal.go6
-rw-r--r--pkg/domain/infra/abi/containers.go6
3 files changed, 98 insertions, 25 deletions
diff --git a/libpod/container_api.go b/libpod/container_api.go
index 951227a4f..c64074d80 100644
--- a/libpod/container_api.go
+++ b/libpod/container_api.go
@@ -5,6 +5,7 @@ import (
"io/ioutil"
"net/http"
"os"
+ "sync"
"time"
"github.com/containers/podman/v2/libpod/define"
@@ -478,13 +479,15 @@ func (c *Container) RemoveArtifact(name string) error {
}
// Wait blocks until the container exits and returns its exit code.
-func (c *Container) Wait() (int32, error) {
- return c.WaitWithInterval(DefaultWaitInterval)
+func (c *Container) Wait(ctx context.Context) (int32, error) {
+ return c.WaitWithInterval(ctx, DefaultWaitInterval)
}
+var errWaitingCanceled = errors.New("waiting was canceled")
+
// WaitWithInterval blocks until the container to exit and returns its exit
// code. The argument is the interval at which checks the container's status.
-func (c *Container) WaitWithInterval(waitTimeout time.Duration) (int32, error) {
+func (c *Container) WaitWithInterval(ctx context.Context, waitTimeout time.Duration) (int32, error) {
if !c.valid {
return -1, define.ErrCtrRemoved
}
@@ -495,41 +498,111 @@ func (c *Container) WaitWithInterval(waitTimeout time.Duration) (int32, error) {
}
chWait := make(chan error, 1)
- defer close(chWait)
+ go func() {
+ <-ctx.Done()
+ chWait <- errWaitingCanceled
+ }()
for {
- // ignore errors here, it is only used to avoid waiting
+ // ignore errors here (with exception of cancellation), it is only used to avoid waiting
// too long.
- _, _ = WaitForFile(exitFile, chWait, waitTimeout)
+ _, e := WaitForFile(exitFile, chWait, waitTimeout)
+ if e == errWaitingCanceled {
+ return -1, errWaitingCanceled
+ }
- stopped, err := c.isStopped()
+ stopped, code, err := c.isStopped()
if err != nil {
return -1, err
}
if stopped {
- return c.state.ExitCode, nil
+ return code, nil
}
}
}
-func (c *Container) WaitForConditionWithInterval(waitTimeout time.Duration, condition define.ContainerStatus) (int32, error) {
+type waitResult struct {
+ code int32
+ err error
+}
+
+func (c *Container) WaitForConditionWithInterval(ctx context.Context, waitTimeout time.Duration, conditions ...define.ContainerStatus) (int32, error) {
if !c.valid {
return -1, define.ErrCtrRemoved
}
- if condition == define.ContainerStateStopped || condition == define.ContainerStateExited {
- return c.WaitWithInterval(waitTimeout)
+
+ if len(conditions) == 0 {
+ panic("at least one condition should be passed")
}
- for {
- state, err := c.State()
- if err != nil {
- return -1, err
+
+ ctx, cancelFn := context.WithCancel(ctx)
+ defer cancelFn()
+
+ resultChan := make(chan waitResult)
+ waitForExit := false
+ wantedStates := make(map[define.ContainerStatus]bool, len(conditions))
+
+ for _, condition := range conditions {
+ if condition == define.ContainerStateStopped || condition == define.ContainerStateExited {
+ waitForExit = true
+ continue
}
- if state == condition {
- break
+ wantedStates[condition] = true
+ }
+
+ trySend := func(code int32, err error) {
+ select {
+ case resultChan <- waitResult{code, err}:
+ case <-ctx.Done():
}
- time.Sleep(waitTimeout)
}
- return -1, nil
+
+ var wg sync.WaitGroup
+
+ if waitForExit {
+ wg.Add(1)
+ go func() {
+ defer wg.Done()
+
+ code, err := c.WaitWithInterval(ctx, waitTimeout)
+ trySend(code, err)
+ }()
+ }
+
+ if len(wantedStates) > 0 {
+ wg.Add(1)
+ go func() {
+ defer wg.Done()
+
+ for {
+ state, err := c.State()
+ if err != nil {
+ trySend(-1, err)
+ return
+ }
+ if _, found := wantedStates[state]; found {
+ trySend(-1, nil)
+ return
+ }
+ select {
+ case <-ctx.Done():
+ return
+ case <-time.After(waitTimeout):
+ continue
+ }
+ }
+ }()
+ }
+
+ var result waitResult
+ select {
+ case result = <-resultChan:
+ cancelFn()
+ case <-ctx.Done():
+ result = waitResult{-1, errWaitingCanceled}
+ }
+ wg.Wait()
+ return result.code, result.err
}
// Cleanup unmounts all mount points in container and cleans up container storage
diff --git a/libpod/container_internal.go b/libpod/container_internal.go
index b9ea50783..5a61f7fe6 100644
--- a/libpod/container_internal.go
+++ b/libpod/container_internal.go
@@ -754,17 +754,17 @@ func (c *Container) getArtifactPath(name string) string {
}
// Used with Wait() to determine if a container has exited
-func (c *Container) isStopped() (bool, error) {
+func (c *Container) isStopped() (bool, int32, error) {
if !c.batched {
c.lock.Lock()
defer c.lock.Unlock()
}
err := c.syncContainer()
if err != nil {
- return true, err
+ return true, -1, err
}
- return !c.ensureState(define.ContainerStateRunning, define.ContainerStatePaused, define.ContainerStateStopping), nil
+ return !c.ensureState(define.ContainerStateRunning, define.ContainerStatePaused, define.ContainerStateStopping), c.state.ExitCode, nil
}
// save container state to the database
diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go
index d0599a595..cfd3d7272 100644
--- a/pkg/domain/infra/abi/containers.go
+++ b/pkg/domain/infra/abi/containers.go
@@ -100,7 +100,7 @@ func (ic *ContainerEngine) ContainerWait(ctx context.Context, namesOrIds []strin
responses := make([]entities.WaitReport, 0, len(ctrs))
for _, c := range ctrs {
response := entities.WaitReport{Id: c.ID()}
- exitCode, err := c.WaitForConditionWithInterval(options.Interval, options.Condition)
+ exitCode, err := c.WaitForConditionWithInterval(ctx, options.Interval, options.Condition)
if err != nil {
response.Error = err
} else {
@@ -728,7 +728,7 @@ func (ic *ContainerEngine) ContainerStart(ctx context.Context, namesOrIds []stri
return reports, errors.Wrapf(err, "unable to start container %s", ctr.ID())
}
- if ecode, err := ctr.Wait(); err != nil {
+ if ecode, err := ctr.Wait(ctx); err != nil {
if errors.Cause(err) == define.ErrNoSuchCtr {
// Check events
event, err := ic.Libpod.GetLastContainerEvent(ctx, ctr.ID(), events.Exited)
@@ -867,7 +867,7 @@ func (ic *ContainerEngine) ContainerRun(ctx context.Context, opts entities.Conta
return &report, err
}
- if ecode, err := ctr.Wait(); err != nil {
+ if ecode, err := ctr.Wait(ctx); err != nil {
if errors.Cause(err) == define.ErrNoSuchCtr {
// Check events
event, err := ic.Libpod.GetLastContainerEvent(ctx, ctr.ID(), events.Exited)