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

systemd: fix NOTIFY_SOCKET with patched runc #1798

Merged
merged 3 commits into from
Nov 28, 2018
Merged

systemd: fix NOTIFY_SOCKET with patched runc #1798

merged 3 commits into from
Nov 28, 2018

Conversation

giuseppe
Copy link
Member

with opencontainers/runc#1807 we moved the systemd notify initialization from "create" to "start", so that the OCI runtime doesn't hang while waiting on reading from the notify socket. This means we also need to set the correct NOTIFY_SOCKET when start'ing the container.

Closes: #746

@giuseppe giuseppe mentioned this pull request Nov 10, 2018
Closed
@rhatdan
Copy link
Member

rhatdan commented Nov 11, 2018

/approve

@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rhatdan

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-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 11, 2018
@rhatdan
Copy link
Member

rhatdan commented Nov 11, 2018

LGTM
bot, retest this please

@umohnani8
Copy link
Member

LGTM

@rhatdan
Copy link
Member

rhatdan commented Nov 12, 2018

bot, retest this please

@TomSweeneyRedHat
Copy link
Member

Change LGTM, all kinds of test unhappiness though.

@giuseppe giuseppe force-pushed the fix-notify-socket branch 2 times, most recently from deed469 to 9e6fa9b Compare November 12, 2018 15:29
@rhatdan
Copy link
Member

rhatdan commented Nov 12, 2018

I think SELinux will block the tests from running correctly until we get the updates container-selinux package.

@giuseppe giuseppe force-pushed the fix-notify-socket branch 2 times, most recently from 8330d0f to 6ae25fd Compare November 19, 2018 10:19
@rhatdan
Copy link
Member

rhatdan commented Nov 26, 2018

bot, retest this please

@giuseppe giuseppe force-pushed the fix-notify-socket branch 5 times, most recently from 84b422b to 712e0d9 Compare November 28, 2018 11:46
@giuseppe giuseppe force-pushed the fix-notify-socket branch 3 times, most recently from 19ae69a to d4d1a0d Compare November 28, 2018 15:13
@giuseppe
test: fix test for NOTIFY_SOCKET
f7d972a 
do not make any assumption on the path inside of the container.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
@giuseppe
oci: propagate NOTIFY_SOCKET on runtime start
fe919e4 
with opencontainers/runc#1807 we moved the
systemd notify initialization from "create" to "start", so that the
OCI runtime doesn't hang while waiting on reading from the notify
socket.  This means we also need to set the correct NOTIFY_SOCKET when
start'ing the container.

Closes: containers#746

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
@giuseppe giuseppe force-pushed the fix-notify-socket branch 2 times, most recently from d766fd5 to 22e923b Compare November 28, 2018 15:30
@giuseppe
Copy link
Member Author

the NOTIFY_SOCKET test blocks without a fixed runc, so I've enabled it only on Fedora/CentOS/RHEL

@giuseppe
tests: fix NOTIFY_SOCKET test
180d0c6 
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
@mheon
Copy link
Member

mheon commented Nov 28, 2018

This LGTM. Will merge once tests green.

@giuseppe
Copy link
Member Author

tests are green

@mheon
Copy link
Member

mheon commented Nov 28, 2018

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 28, 2018
@openshift-merge-robot openshift-merge-robot merged commit 22d53e2 into containers:master Nov 28, 2018
@Conan-Kudo
Copy link

I'm confused, why did this close #746?

@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 27, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 27, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@mheon mheon Awaiting requested review from mheon

@umohnani8 umohnani8 Awaiting requested review from umohnani8

Assignees

@mheon mheon

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.
8 participants
@giuseppe @rhatdan @openshift-ci-robot @umohnani8 @TomSweeneyRedHat @mheon @Conan-Kudo @openshift-merge-robot