containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use GetContainer instead of LookupContainer for full ID 

All IDs in libpod are stored as a full container ID. We can get a
container by full ID faster with GetContainer (which directly
retrieves) than LookupContainer (which finds a match, then
retrieves). No reason to use Lookup when we have full IDs present
and available.

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
This commit is contained in:
Matthew Heon 2019-04-12 10:21:45 -04:00
parent 638789fd88
commit f7951c8776
4 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libpod/container.go
View File

@ -614,7 +614,7 @@ func (c *Container) NewNetNS() bool {
func (c *Container) PortMappings() ([]ocicni.PortMapping, error) { func (c *Container) PortMappings() ([]ocicni.PortMapping, error) {
// First check if the container belongs to a network namespace (like a pod) // First check if the container belongs to a network namespace (like a pod)
if len(c.config.NetNsCtr) > 0 { if len(c.config.NetNsCtr) > 0 {
netNsCtr, err := c.runtime.LookupContainer(c.config.NetNsCtr) netNsCtr, err := c.runtime.GetContainer(c.config.NetNsCtr)
if err != nil { if err != nil {
return nil, errors.Wrapf(err, "unable to lookup network namespace for container %s", c.ID()) return nil, errors.Wrapf(err, "unable to lookup network namespace for container %s", c.ID())
} }

2
libpod/container_internal.go
View File

@ -676,7 +676,7 @@ func (c *Container) getAllDependencies(visited map[string]*Container) error {
} }
for _, depID := range depIDs { for _, depID := range depIDs {
if _, ok := visited[depID]; !ok { if _, ok := visited[depID]; !ok {
dep, err := c.runtime.state.LookupContainer(depID) dep, err := c.runtime.state.Container(depID)
if err != nil { if err != nil {
return err return err
} }

2
libpod/kube.go
View File

@ -69,7 +69,7 @@ func (p *Pod) getInfraContainer() (*Container, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
return p.runtime.LookupContainer(infraID) return p.runtime.GetContainer(infraID)
} }
// GenerateKubeServiceFromV1Pod creates a v1 service object from a v1 pod object // GenerateKubeServiceFromV1Pod creates a v1 service object from a v1 pod object

10
libpod/runtime_ctr.go
View File

@ -547,16 +547,6 @@ func (r *Runtime) GetLatestContainer() (*Container, error) {
return ctrs[lastCreatedIndex], nil return ctrs[lastCreatedIndex], nil
} }
// Export is the libpod portion of exporting a container to a tar file
func (r *Runtime) Export(name string, path string) error {
ctr, err := r.LookupContainer(name)
if err != nil {
return err
}
return ctr.Export(path)
}
// RemoveContainersFromStorage attempt to remove containers from storage that do not exist in libpod database // RemoveContainersFromStorage attempt to remove containers from storage that do not exist in libpod database
func (r *Runtime) RemoveContainersFromStorage(ctrs []string) { func (r *Runtime) RemoveContainersFromStorage(ctrs []string) {
for _, i := range ctrs { for _, i := range ctrs {