diff options
| author | Toshiki Sonoda <sonoda.toshiki@fujitsu.com> | 2022-07-19 10:00:33 +0900 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2022-07-26 13:37:56 -0400 |
| commit | de8d2cc9444c82196cc234582359ca98aa2708ec (patch) | |
| tree | 02794becf027e8d6fd86867d9385dd4f2c050b48 /pkg | |
| parent | 409fbeaabafe3e01b0f8bf9fdba8875a2a52a237 (diff) | |
| download | podman-de8d2cc9444c82196cc234582359ca98aa2708ec.tar.gz podman-de8d2cc9444c82196cc234582359ca98aa2708ec.tar.bz2 podman-de8d2cc9444c82196cc234582359ca98aa2708ec.zip | |
"pod pause/unpause/stop" append "report.Errs" to "reports"
There is a possibility that podman does not output expected error message.
(e.g. When pause rootless cgroups v1 container on host)
This problem is solved by appending `report.Errs` to `reports` before `continue`.
[NO NEW TESTS NEEDED]
Signed-off-by: Toshiki Sonoda <sonoda.toshiki@fujitsu.com>
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 { |