Skip to content

Conversation

brb
Copy link
Member

@brb brb commented Mar 5, 2021

See commit msgs.

Fix possible deadlock when querying network interfaces for arping

@brb brb added kind/backports This PR provides functionality previously merged into master. backport/1.9 labels Mar 5, 2021
@brb brb requested a review from a team as a code owner March 5, 2021 15:34
@brb
Copy link
Member Author

brb commented Mar 5, 2021

test-backport-1.9

Edit: hit variant of #14996

@christarazi
Copy link
Member

test-upstream-k8s

@christarazi
Copy link
Member

retest-1.17-4.9

@joestringer joestringer added the dont-merge/needs-rebase This PR needs to be rebased because it has merge conflicts. label Mar 5, 2021
brb added 2 commits March 5, 2021 14:53
The bumped version includes the change [1] which sets a timeout for a
default netlink socket. This prevents deadlocks when receiving a netlink
msg (netlink is not reliable proto).

[1]: vishvananda/netlink#614

Signed-off-by: Martynas Pumputis <m@lambda.lt>
This commit bumps github.com/cilium/arping version to accept
netlink.Link instead of net.Interface.

The change allows us to use netlink to query netdevs which avoids a
possible deadlock described in the previous commit.

Signed-off-by: Martynas Pumputis <m@lambda.lt>
@christarazi christarazi force-pushed the pr/brb/v1.9-arping-netlink branch from a65fac9 to 57a80fd Compare March 5, 2021 22:53
@christarazi
Copy link
Member

test-backport-1.9

@christarazi christarazi removed the dont-merge/needs-rebase This PR needs to be rebased because it has merge conflicts. label Mar 5, 2021
@christarazi
Copy link
Member

retest-gke

@aanm aanm added the release-note/bug This PR fixes an issue in a previous release of Cilium. label Mar 8, 2021
@aanm aanm merged commit 9ea3543 into v1.9 Mar 8, 2021
@aanm aanm deleted the pr/brb/v1.9-arping-netlink branch March 8, 2021 11:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/backports This PR provides functionality previously merged into master. release-note/bug This PR fixes an issue in a previous release of Cilium.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants