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

libct/cg/sd: check dbus.ErrClosed instead of isDbusError #3475

Merged
merged 1 commit into from
May 20, 2022
Merged

libct/cg/sd: check dbus.ErrClosed instead of isDbusError #3475

merged 1 commit into from
May 20, 2022

Conversation

chenk008
Copy link
Contributor

@chenk008 chenk008 commented May 20, 2022 •
edited
Loading

This fixes dbus.ErrClosed checker in "retry on dbus disconnect" logic, introduced in PR #2923. dbus.ErrClosed is not a dbus.Error.

It can reproduce in kubelet:

  1. start kubelet
  2. systemctl restart dbus in this node
  3. schedule some pod to this node. The pod will failed to start dbus: connection closed by user

So kubernetes need to bump libct with this fix.

Signed-off-by: Kang Chen kongchen28@gmail.com

@chenk008 chenk008 force-pushed the fix_dbus_connection_closed branch from db66075 to 39335dd Compare May 20, 2022 06:41
@chenk008
libct/cg/sd: check dbus.ErrClosed instead of isDbusError
0ca0bb9 
Signed-off-by: Kang Chen <kongchen28@gmail.com>
@chenk008 chenk008 force-pushed the fix_dbus_connection_closed branch from 39335dd to 0ca0bb9 Compare May 20, 2022 06:47
kolyshkin
kolyshkin approved these changes May 20, 2022
View reviewed changes
Copy link
Contributor

@kolyshkin kolyshkin left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for catching this.

Need a backport to 1.1 and maybe even 1.0.

@kolyshkin kolyshkin added backport/todo/1.0 A PR in main branch which needs to be backported to release-1.0 backport/todo/1.1 A PR in main branch which needs to be backported to release-1.1 labels May 20, 2022
@kolyshkin kolyshkin merged commit 967079d into opencontainers:main May 20, 2022
@kolyshkin kolyshkin mentioned this pull request May 20, 2022
Merged
@kolyshkin kolyshkin added backport/done/1.1 A PR in main branch which was backported to release-1.1 and removed backport/todo/1.1 A PR in main branch which needs to be backported to release-1.1 labels May 20, 2022
@eriksjolund eriksjolund mentioned this pull request May 27, 2022
Merged
@cbgbt cbgbt mentioned this pull request Jun 2, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kolyshkin kolyshkin kolyshkin approved these changes

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

Assignees
No one assigned
Labels
area/systemd backport/done/1.1 A PR in main branch which was backported to release-1.1 backport/todo/1.0 A PR in main branch which needs to be backported to release-1.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@chenk008 @kolyshkin @AkihiroSuda