opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 02:18:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8726 from giuseppe/conmon-rootless-errs-to-info

Browse Source 
libpod, conmon: change log level for rootless
This commit is contained in:
OpenShift Merge Robot
2020-12-15 20:26:39 +00:00
committed by GitHub
parent 9379ee9790 8bfba70185
commit e689503fd6
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/cirrus/required_host_ports.txt
View File

@ -5,7 +5,6 @@ registry.fedoraproject.org 443
mirrors.fedoraproject.org 443 mirrors.fedoraproject.org 443
dl.fedoraproject.org 443 dl.fedoraproject.org 443
ewr.edge.kernel.org 443 ewr.edge.kernel.org 443
mirror.chpc.utah.edu 443
mirror.clarkson.edu 443 mirror.clarkson.edu 443
mirror.umd.edu 443 mirror.umd.edu 443
mirror.vcu.edu 443 mirror.vcu.edu 443

14
libpod/oci_conmon_linux.go
View File

@ -1433,6 +1433,14 @@ func (r *ConmonOCIRuntime) moveConmonToCgroupAndSignal(ctr *Container, cmd *exec
} }
if mustCreateCgroup { if mustCreateCgroup {
// Usually rootless users are not allowed to configure cgroupfs.
// There are cases though, where it is allowed, e.g. if the cgroup
// is manually configured and chowned). Avoid detecting all
// such cases and simply use a lower log level.
logLevel := logrus.WarnLevel
if rootless.IsRootless() {
logLevel = logrus.InfoLevel
}
// TODO: This should be a switch - we are not guaranteed that // TODO: This should be a switch - we are not guaranteed that
// there are only 2 valid cgroup managers // there are only 2 valid cgroup managers
cgroupParent := ctr.CgroupParent() cgroupParent := ctr.CgroupParent()
@ -1447,17 +1455,17 @@ func (r *ConmonOCIRuntime) moveConmonToCgroupAndSignal(ctr *Container, cmd *exec
logrus.Infof("Running conmon under slice %s and unitName %s", realCgroupParent, unitName) logrus.Infof("Running conmon under slice %s and unitName %s", realCgroupParent, unitName)
if err := utils.RunUnderSystemdScope(cmd.Process.Pid, realCgroupParent, unitName); err != nil { if err := utils.RunUnderSystemdScope(cmd.Process.Pid, realCgroupParent, unitName); err != nil {
logrus.Warnf("Failed to add conmon to systemd sandbox cgroup: %v", err) logrus.StandardLogger().Logf(logLevel, "Failed to add conmon to systemd sandbox cgroup: %v", err)
} }
} else { } else {
cgroupPath := filepath.Join(ctr.config.CgroupParent, "conmon") cgroupPath := filepath.Join(ctr.config.CgroupParent, "conmon")
control, err := cgroups.New(cgroupPath, &spec.LinuxResources{}) control, err := cgroups.New(cgroupPath, &spec.LinuxResources{})
if err != nil { if err != nil {
logrus.Warnf("Failed to add conmon to cgroupfs sandbox cgroup: %v", err) logrus.StandardLogger().Logf(logLevel, "Failed to add conmon to cgroupfs sandbox cgroup: %v", err)
} else if err := control.AddPid(cmd.Process.Pid); err != nil { } else if err := control.AddPid(cmd.Process.Pid); err != nil {
// we need to remove this defer and delete the cgroup once conmon exits // we need to remove this defer and delete the cgroup once conmon exits
// maybe need a conmon monitor? // maybe need a conmon monitor?
logrus.Warnf("Failed to add conmon to cgroupfs sandbox cgroup: %v", err) logrus.StandardLogger().Logf(logLevel, "Failed to add conmon to cgroupfs sandbox cgroup: %v", err)
} }
} }
} }