Skip to content

Separate systemd dbus connection initialization from running check#2203

Merged
crosbymichael merged 2 commits intoopencontainers:masterfrom
mrunalp:systemd_conn_cleanup
Mar 31, 2020
Merged

Separate systemd dbus connection initialization from running check#2203
crosbymichael merged 2 commits intoopencontainers:masterfrom
mrunalp:systemd_conn_cleanup

Conversation

@mrunalp
Copy link
Copy Markdown
Contributor

@mrunalp mrunalp commented Jan 11, 2020

This allows us to catch and report any failures in initializing the systemd dbus connection.

@mrunalp mrunalp force-pushed the systemd_conn_cleanup branch 2 times, most recently from 610df46 to 33771c7 Compare January 14, 2020 16:30
@mrunalp
Copy link
Copy Markdown
Contributor Author

mrunalp commented Jan 14, 2020

@opencontainers/runc-maintainers ptal

@AkihiroSuda
Copy link
Copy Markdown
Member

AkihiroSuda commented Jan 27, 2020

@cyphar @dqminh @hqhq PTAL?

@hqhq
Copy link
Copy Markdown
Contributor

hqhq commented Feb 1, 2020 •
edited by caniszczyk
Loading

LGTM

Approved with PullApprove

@AkihiroSuda
Copy link
Copy Markdown
Member

AkihiroSuda commented Feb 9, 2020

@cyphar @dqminh mergeable?

@mrunalp mrunalp mentioned this pull request Mar 4, 2020
Closed
@AkihiroSuda
Copy link
Copy Markdown
Member

AkihiroSuda commented Mar 4, 2020

Needs rebase. Also, could you consider melding #2241 into this?

@mrunalp
Copy link
Copy Markdown
Contributor Author

mrunalp commented Mar 4, 2020

@AkihiroSuda Yeah, I can merge #2241 into this.

@AkihiroSuda
Copy link
Copy Markdown
Member

AkihiroSuda commented Mar 11, 2020

ping

@AkihiroSuda
Copy link
Copy Markdown
Member

AkihiroSuda commented Mar 27, 2020

ping @mrunalp

@mrunalp
Copy link
Copy Markdown
Contributor Author

mrunalp commented Mar 27, 2020

okay, I am working on rebasing this with the other PR today.

@mrunalp mrunalp force-pushed the systemd_conn_cleanup branch from 33771c7 to 89351b2 Compare March 27, 2020 22:04
@mrunalp
Copy link
Copy Markdown
Contributor Author

mrunalp commented Mar 27, 2020

okay, rebased. @AkihiroSuda Do you feel strongly about returning error as you did in your PR for UseSystemd? I have split that into IsSystemdRunning() and a separate function to get the dbus connection so if there are any failures in getting the connection they get propagated and returned up the stack. Also, we compile systemd support on Linux by default so just returning false in apply_nosystemd is sufficient I think.

@AkihiroSuda
Copy link
Copy Markdown
Member

AkihiroSuda commented Mar 27, 2020 •
edited
Loading

LGTM

Approved with PullApprove

mrunalp added 2 commits March 30, 2020 15:24
@mrunalp
systemd: Export IsSystemdRunning() function
33c6125 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
@mrunalp
systemd: Lazy initialize the systemd dbus connection
d05e572 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
@mrunalp mrunalp force-pushed the systemd_conn_cleanup branch from 89351b2 to d05e572 Compare March 30, 2020 22:24
@AkihiroSuda
Copy link
Copy Markdown
Member

AkihiroSuda commented Mar 31, 2020 •
edited
Loading

LGTM (still)

Approved with PullApprove

@mrunalp
Copy link
Copy Markdown
Contributor Author

mrunalp commented Mar 31, 2020

@opencontainers/runc-maintainers ptal

@crosbymichael
Copy link
Copy Markdown
Member

crosbymichael commented Mar 31, 2020 •
edited by AkihiroSuda
Loading

LGTM

Approved with PullApprove

@crosbymichael crosbymichael merged commit 92a3f80 into opencontainers:master Mar 31, 2020
@kolyshkin kolyshkin mentioned this pull request Apr 27, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

enhancement

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@mrunalp @AkihiroSuda @hqhq @crosbymichael