summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcdoern <cbdoer23@g.holycross.edu>2022-04-27 20:54:24 -0400
committerMatthew Heon <matthew.heon@pm.me>2022-05-03 13:43:12 -0400
commit159d597cdc301adaf7e125f0870e9fbe0291fcb8 (patch)
tree935369d23d83b5d25439594711a33d629591ca99
parenta9a70a9491ffdaea40c9b521f6d2afe140226b9f (diff)
downloadpodman-159d597cdc301adaf7e125f0870e9fbe0291fcb8.tar.gz
podman-159d597cdc301adaf7e125f0870e9fbe0291fcb8.tar.bz2
podman-159d597cdc301adaf7e125f0870e9fbe0291fcb8.zip
remove unused codepath for creating/running ctr in a pod
`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 <cbdoer23@g.holycross.edu>
-rw-r--r--libpod/pod.go27
1 files changed, 0 insertions, 27 deletions
diff --git a/libpod/pod.go b/libpod/pod.go
index 6cfe76a18..237c42901 100644
--- a/libpod/pod.go
+++ b/libpod/pod.go
@@ -1,7 +1,6 @@
package libpod
import (
- "context"
"fmt"
"sort"
"strings"
@@ -305,35 +304,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
}