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

Skip to content

[release-1.24] utils/RunUnderSystemdScope: fix wrt channel deadlock #5954

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
Jun 9, 2022
Merged

[release-1.24] utils/RunUnderSystemdScope: fix wrt channel deadlock #5954

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
18 changes: 13 additions & 5 deletions utils/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,16 +70,24 @@ func RunUnderSystemdScope(mgr *dbusmgr.DbusConnManager, pid int, slice, unitName
if slice != "" {
properties = append(properties, systemdDbus.PropSlice(slice))
}
ch := make(chan string)
// Make a buffered channel so that the sender (go-systemd's jobComplete)
// won't be blocked on channel send while holding the jobListener lock
// (RHBZ#2082344).
ch := make(chan string, 1)
if err := mgr.RetryOnDisconnect(func(c *systemdDbus.Conn) error {
_, err = c.StartTransientUnitContext(ctx, unitName, "replace", properties, ch)
return errors.Wrap(err, "start transient unit")
}); err != nil {
return err
}); err != nil {
return fmt.Errorf("start transient unit %q: %w", unitName, err)
}

// Block until job is started
// Wait for the job status.
select {
case s := <-ch:
close(ch)
if s != "done" {
return fmt.Errorf("error moving conmon with pid %d to systemd unit %s: got %s", pid, unitName, s)
}
case <-ch:
close(ch)
case <-time.After(time.Minute * 6):
Expand All @@ -89,7 +97,7 @@ func RunUnderSystemdScope(mgr *dbusmgr.DbusConnManager, pid int, slice, unitName
// We also don't use the native context cancelling behavior of the dbus library,
// because experience has shown that it does not help.
// TODO: Find cause of the request being dropped in the dbus library and fix it.
return errors.Errorf("timed out moving conmon with pid %d to cgroup", pid)
return errors.Errorf("timed out moving conmon with pid %d to systemd unit %s", pid, unitName)
}

return nil
Expand Down