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

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>
This commit is contained in:
cdoern 2022-04-27 20:54:24 -04:00
parent 78c66fb005
commit 64a368ba24
1 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libpod/pod.go
View File

@ -1,7 +1,6 @@
package libpod package libpod
import ( import (
"context"
"fmt" "fmt"
"sort" "sort"
"strings" "strings"
@ -296,35 +295,9 @@ func (p *Pod) CgroupPath() (string, error) {
if err := p.updatePod(); err != nil { if err := p.updatePod(); err != nil {
return "", err return "", err
} }
if p.state.CgroupPath != "" {
return p.state.CgroupPath, nil
}
if p.state.InfraContainerID == "" { if p.state.InfraContainerID == "" {
return "", errors.Wrap(define.ErrNoSuchCtr, "pod has no infra container") 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 return p.state.CgroupPath, nil
} }