Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Add After=crio.service dependency to containers and conmon #4766

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Apr 19, 2021
Merged

Add After=crio.service dependency to containers and conmon #4766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/config/cgmgr/systemd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ func (*SystemdManager) MoveConmonToCgroup(cid, cgroupParent, conmonCgroup string
Value: dbus.MakeVariant(int(unix.SIGPIPE)),
}
logrus.Debugf("Running conmon under slice %s and unitName %s", cgroupParent, conmonUnitName)
if err := utils.RunUnderSystemdScope(pid, cgroupParent, conmonUnitName, killSignalProp); err != nil {
if err := utils.RunUnderSystemdScope(pid, cgroupParent, conmonUnitName, killSignalProp, systemdDbus.PropAfter("crio.service")); err != nil {
return "", errors.Wrapf(err, "failed to add conmon to systemd sandbox cgroup")
}
// return empty string as path because cgroup cleanup is done by systemd
Expand Down
1 change: 1 addition & 0 deletions pkg/container/container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ func (c *container) SpecAddAnnotations(ctx context.Context, sb *sandbox.Sandbox,
c.spec.AddAnnotation("org.systemd.property.CollectMode", "'inactive-or-failed'")
}
c.spec.AddAnnotation("org.systemd.property.DefaultDependencies", "true")
c.spec.AddAnnotation("org.systemd.property.After", "['crio.service']")
}

if configStopSignal != "" {
Expand Down