diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-07-20 12:01:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-20 12:01:10 +0200 |
| commit | 8c9eff5b12eebe318be1f905562be6a236285caa (patch) | |
| tree | eaf183ef9fd59b6fa3a534d01001610490c6c5ae /pkg | |
| parent | 6d9f34c6301910892f7746dc93b226f7c16f8c2c (diff) | |
| parent | 26ae055a244d23f6396d96ea0f727bbc4d868c9b (diff) | |
| download | podman-8c9eff5b12eebe318be1f905562be6a236285caa.tar.gz podman-8c9eff5b12eebe318be1f905562be6a236285caa.tar.bz2 podman-8c9eff5b12eebe318be1f905562be6a236285caa.zip | |
Merge pull request #14945 from sstosh/pod-pause-cgroupv1
"podman pod pause" return error if cgroups v1 rootless container
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/domain/infra/abi/pods.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkg/domain/infra/abi/pods.go b/pkg/domain/infra/abi/pods.go index 9a16f7fcd..03c8082c4 100644 --- a/pkg/domain/infra/abi/pods.go +++ b/pkg/domain/infra/abi/pods.go @@ -138,6 +138,7 @@ func (ic *ContainerEngine) PodPause(ctx context.Context, namesOrIds []string, op errs, err := p.Pause(ctx) if err != nil && !errors.Is(err, define.ErrPodPartialFail) { report.Errs = []error{err} + reports = append(reports, &report) continue } if len(errs) > 0 { @@ -171,6 +172,7 @@ func (ic *ContainerEngine) PodUnpause(ctx context.Context, namesOrIds []string, errs, err := p.Unpause(ctx) if err != nil && !errors.Is(err, define.ErrPodPartialFail) { report.Errs = []error{err} + reports = append(reports, &report) continue } if len(errs) > 0 { @@ -196,6 +198,7 @@ func (ic *ContainerEngine) PodStop(ctx context.Context, namesOrIds []string, opt errs, err := p.StopWithTimeout(ctx, false, options.Timeout) if err != nil && !errors.Is(err, define.ErrPodPartialFail) { report.Errs = []error{err} + reports = append(reports, &report) continue } if len(errs) > 0 { |