diff options
| author | Matthew Heon <matthew.heon@pm.me> | 2020-08-04 15:51:13 -0400 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2020-08-20 12:16:53 -0400 |
| commit | eff0c29098fe988327112c37884d57a7b244ac40 (patch) | |
| tree | 22106956800a1dec064259b599b2d28c5cc8406b /pkg/ps | |
| parent | 35d2db807239eb193edd0d775a95aadb3279f01f (diff) | |
| download | podman-eff0c29098fe988327112c37884d57a7b244ac40.tar.gz podman-eff0c29098fe988327112c37884d57a7b244ac40.tar.bz2 podman-eff0c29098fe988327112c37884d57a7b244ac40.zip | |
Unconditionally retrieve pod names via API
The ListContainers API previously had a Pod parameter, which
determined if pod name was returned (but, notably, not Pod ID,
which was returned unconditionally). This was fairly confusing,
so we decided to deprecate/remove the parameter and return it
unconditionally.
To do this without serious performance implications, we need to
avoid expensive JSON decodes of pod configuration in the DB. The
way our Bolt tables are structured, retrieving name given ID is
actually quite cheap, but we did not expose this via the Libpod
API. Add a new GetName API to do this.
Fixes #7214
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'pkg/ps')
| -rw-r--r-- | pkg/ps/ps.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkg/ps/ps.go b/pkg/ps/ps.go index 2b81311af..d4fd96596 100644 --- a/pkg/ps/ps.go +++ b/pkg/ps/ps.go @@ -175,11 +175,14 @@ func ListContainerBatch(rt *libpod.Runtime, ctr *libpod.Container, opts entities State: conState.String(), } if opts.Pod && len(conConfig.Pod) > 0 { - pod, err := rt.GetPod(conConfig.Pod) + podName, err := rt.GetName(conConfig.Pod) if err != nil { + if errors.Cause(err) == define.ErrNoSuchCtr { + return entities.ListContainer{}, errors.Wrapf(define.ErrNoSuchPod, "could not find container %s pod (id %s) in state", conConfig.ID, conConfig.Pod) + } return entities.ListContainer{}, err } - ps.PodName = pod.Name() + ps.PodName = podName } if opts.Namespace { |