Skip to content
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

Jump to bottom

Implement SD-NOTIFY proxy in conmon #11246

Merged
merged 1 commit into from
Aug 20, 2021
Merged

Implement SD-NOTIFY proxy in conmon #11246

merged 1 commit into from
Aug 20, 2021

Conversation

vrothberg
Copy link
Member

@vrothberg vrothberg commented Aug 17, 2021 •
edited
Loading

This leverages conmon's ability to proxy the SD-NOTIFY socket.
This prevents locking caused by OCI runtime blocking, waiting for
SD-NOTIFY messages, and instead passes the messages directly up
to the host.

NOTE: Also re-enable the auto-update tests which has been disabled due
to flakiness. With this change, Podman properly integrates into
systemd.

Fixes: #7316
Signed-off-by: Joseph Gooch [email protected]
Signed-off-by: Daniel J Walsh [email protected]
Signed-off-by: Valentin Rothberg [email protected]

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 17, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vrothberg

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 17, 2021
@vrothberg vrothberg mentioned this pull request Aug 17, 2021
Closed
@vrothberg
Copy link
Member Author

Note to self: close #7316 once this is merged.

@vrothberg vrothberg mentioned this pull request Aug 17, 2021
Closed
@vrothberg
Copy link
Member Author

Will fix the checkpoint fart tomorrow.

@vrothberg
Copy link
Member Author

@containers/podman-maintainers PTAL

Luap99
Luap99 reviewed Aug 19, 2021
View reviewed changes
Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
Should this be backported to 3.3 given that the systemd units now use sdnotify?

@vrothberg
Copy link
Member Author

LGTM
Should this be backported to 3.3 given that the systemd units now use sdnotify?

By default, the systemd units are ok since they use --sdnotify=conmon. The fixes are for --sdnotify=container but I think it's worth backporting.

@vrothberg
Copy link
Member Author

@giuseppe PTAL

@vrothberg
Copy link
Member Author

@containers/podman-maintainers merge me

giuseppe
giuseppe reviewed Aug 19, 2021
View reviewed changes
Copy link
Member

@giuseppe giuseppe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM (with a comment inline)

@edsantiago
Copy link
Member

@giuseppe I do not see any inline comments from you

@giuseppe
Copy link
Member

@giuseppe I do not see any inline comments from you

sorry, added now

@rhatdan @vrothberg
Implement SD-NOTIFY proxy in conmon
c22f3e8 
This leverages conmon's ability to proxy the SD-NOTIFY socket.
This prevents locking caused by OCI runtime blocking, waiting for
SD-NOTIFY messages, and instead passes the messages directly up
to the host.

NOTE: Also re-enable the auto-update tests which has been disabled due
to flakiness.  With this change, Podman properly integrates into
systemd.

Fixes: containers#7316
Signed-off-by: Joseph Gooch <[email protected]>
Signed-off-by: Daniel J Walsh <[email protected]>
Signed-off-by: Valentin Rothberg <[email protected]>
@rhatdan
Copy link
Member

rhatdan commented Aug 20, 2021

/lgtm
/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 20, 2021
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 20, 2021
@rhatdan
Copy link
Member

rhatdan commented Aug 20, 2021

/hold cancel
Brilliant work @vrothberg

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 20, 2021
@openshift-merge-robot openshift-merge-robot merged commit 7d8650c into containers:main Aug 20, 2021
@vrothberg vrothberg deleted the sdnotify=container branch August 20, 2021 11:36
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 22, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 22, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@Luap99 Luap99 Luap99 left review comments

@edsantiago edsantiago edsantiago left review comments

@giuseppe giuseppe giuseppe left review comments

Assignees

@rhatdan rhatdan

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

podman run -d: hangs when $NOTIFY_SOCKET is set
6 participants
@vrothberg @edsantiago @giuseppe @rhatdan @Luap99 @openshift-merge-robot