Skip to content

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

Merged
kolyshkin merged 1 commit intoopencontainers:mainfrom
chenk008:fix_dbus_connection_closed
May 20, 2022
Merged

libct/cg/sd: check dbus.ErrClosed instead of isDbusError#3475
kolyshkin merged 1 commit intoopencontainers:mainfrom
chenk008:fix_dbus_connection_closed

Conversation

@chenk008
Copy link
Copy Markdown
Contributor

@chenk008 chenk008 commented May 20, 2022

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 [email protected]

@chenk008 chenk008 force-pushed the fix_dbus_connection_closed branch from db66075 to 39335dd Compare May 20, 2022 06:41
@chenk008 chenk008 force-pushed the fix_dbus_connection_closed branch from 39335dd to 0ca0bb9 Compare May 20, 2022 06:47
Copy link
Copy Markdown
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/1.0-todo A PR in main branch which needs to be backported to release-1.0 backport/1.1-todo 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 added backport/1.1-done A PR in main branch which has been backported to release-1.1 and removed backport/1.1-todo A PR in main branch which needs to be backported to release-1.1 labels May 20, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/systemd backport/1.0-todo A PR in main branch which needs to be backported to release-1.0 backport/1.1-done A PR in main branch which has been backported to release-1.1

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants