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.

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

[1.1] libct/cg/sd: check dbus.ErrClosed instead of isDbusError #3476

Merged
merged 1 commit into from
May 23, 2022

Conversation

kolyshkin
Copy link
Contributor

This is a backport of #3475 to release-1.1 branch. Original description follows:


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.

@kolyshkin kolyshkin added area/systemd backport/1.1-pr A backport PR to release-1.1 labels May 20, 2022
@kolyshkin kolyshkin changed the title libct/cg/sd: check dbus.ErrClosed instead of isDbusError [1.1] libct/cg/sd: check dbus.ErrClosed instead of isDbusError May 20, 2022
@kolyshkin kolyshkin added this to the 1.1.3 milestone May 20, 2022
Signed-off-by: Kang Chen <kongchen28@gmail.com>
(cherry picked from commit 0ca0bb9)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Copy link
Member

@cyphar cyphar left a comment

Choose a reason for hiding this comment

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

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/systemd backport/1.1-pr A backport PR to release-1.1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants