Skip to content

Commit

Permalink
remove unused codepath for creating/running ctr in a pod
Browse files Browse the repository at this point in the history
`pod.CgroupPath()` currently includes a codepath that is never accessed,
which is supposed to start the infra ctr and obtain the cgroup path from there
that is never necessary/safe because p.state.CgroupPath is never empty

[NO NEW TESTS NEEDED]

Signed-off-by: cdoern <[email protected]>
  • Loading branch information
cdoern committed Apr 28, 2022
1 parent 78c66fb commit 64a368b
Showing 1 changed file with 0 additions and 27 deletions.
27 changes: 0 additions & 27 deletions libpod/pod.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package libpod

import (
"context"
"fmt"
"sort"
"strings"
Expand Down Expand Up @@ -296,35 +295,9 @@ func (p *Pod) CgroupPath() (string, error) {
if err := p.updatePod(); err != nil {
return "", err
}
if p.state.CgroupPath != "" {
return p.state.CgroupPath, nil
}
if p.state.InfraContainerID == "" {
return "", errors.Wrap(define.ErrNoSuchCtr, "pod has no infra container")
}

id, err := p.infraContainerID()
if err != nil {
return "", err
}

if id != "" {
ctr, err := p.infraContainer()
if err != nil {
return "", errors.Wrapf(err, "could not get infra")
}
if ctr != nil {
ctr.Start(context.Background(), true)
cgroupPath, err := ctr.CgroupPath()
fmt.Println(cgroupPath)
if err != nil {
return "", errors.Wrapf(err, "could not get container cgroup")
}
p.state.CgroupPath = cgroupPath
p.save()
return cgroupPath, nil
}
}
return p.state.CgroupPath, nil
}

Expand Down

0 comments on commit 64a368b

Please sign in to comment.