Skip to content

Conversation

brb
Copy link
Member

@brb brb commented Mar 5, 2021

See commit msg.

Fix possible deadlock when querying network interfaces for arping

@brb brb requested a review from a team as a code owner March 5, 2021 15:06
@maintainer-s-little-helper maintainer-s-little-helper bot added backport/1.8 kind/backports This PR provides functionality previously merged into master. labels Mar 5, 2021
@brb
Copy link
Member Author

brb commented Mar 5, 2021

test-backport-1.8

@joestringer
Copy link
Member

Runtime provisioning failure:
https://jenkins.cilium.io/job/Cilium-PR-Runtime-4.9/3821/

Upstream also failed to provision, although the Jenkins infrastructure did not identify that as the root cause:
https://jenkins.cilium.io/job/Cilium-PR-K8s-Upstream/2878/

Travis hit a pull ratelimit from Docker:
https://travis-ci.com/github/cilium/cilium/jobs/488513594

@joestringer
Copy link
Member

test-runtime

@joestringer
Copy link
Member

test-upstream-k8s

@joestringer
Copy link
Member

joestringer commented Mar 6, 2021

@brb #15193 already bumps the netlink library. Is the library bump here necessary?

EDIT: Well, either way, there was a conflict so it will need to be resolved.

@aanm aanm added the dont-merge/needs-rebase This PR needs to be rebased because it has merge conflicts. label Mar 8, 2021
@brb brb force-pushed the pr/brb/v1.8-arping-netlink branch from 9256fa1 to cd56b0c Compare March 9, 2021 08:35
@brb
Copy link
Member Author

brb commented Mar 9, 2021

@joestringer Yep, I've dropped my netlink lib vsn bump, as the forked vsn (cilium/netlink) already contains the required change.

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>
@brb brb force-pushed the pr/brb/v1.8-arping-netlink branch from cd56b0c to 49f65da Compare March 9, 2021 08:38
@brb
Copy link
Member Author

brb commented Mar 9, 2021

test-backport-1.8

@aanm aanm merged commit 572006a into v1.8 Mar 9, 2021
@aanm aanm deleted the pr/brb/v1.8-arping-netlink branch March 9, 2021 12:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dont-merge/needs-rebase This PR needs to be rebased because it has merge conflicts. kind/backports This PR provides functionality previously merged into master.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants