Merge upstream into master (2024-06-10, commit ab67e42af8a5) #110
Conversation
Signed-off-by: Thomas Haller <thaller@redhat.com>
Signed-off-by: Thomas Haller <thaller@redhat.com>
Previously, we called AnnounceIPs() right after configuring the interface. At that point, the interface was just recently set IFF_UP, and it might not yet have carrier. In that case, the messages will be lost. We will need to wait a bit for carrier. Since AnnounceIPs() is an optional performance improvement, let's first do all the important things. Move the non-critical call to the end. This will be interesting next, when we will do some additional waiting for the device to have carrier. Let's not do the waiting in the middle of the critical operations, but only at the end. Signed-off-by: Thomas Haller <thaller@redhat.com>
After setting up the interface, it might take a bit for kernel to detect carrier. If we then already send the GARP/NA packets, they are lost. Instead, wait for up to 200 msec for the interface to get carrier. This time is chosen somewhat arbitrarily. We don't want to block the process too long, but we also need to wait long enough, that kernel and driver has time to detect carrier. Also, while busy waiting, sleep with an exponential back-off time (growth factor 1.5). Fixes: c241dcb ('Send IPv4 GARP and IPv6 Unsolicited NA in "cmdAdd"') See-also: https://issues.redhat.com/browse/OCPBUGS-30549 Signed-off-by: Thomas Haller <thaller@redhat.com>
Co-authored-by: Thomas Haller <thaller@redhat.com> Signed-off-by: Thomas Haller <thaller@redhat.com>
Wait for carrier before announcing IPs via GARP/NA
openshift-ci
bot
added
the
needs-ok-to-test
|
Hi @thom311. Thanks for your PR. I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
|
@SchSeba ping |
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: bn222, thom311 The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
|
/close |
|
this is obsoleted by #111, which does the same thing (and more). Closing. |
|
@bn222: Closed this PR. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
This merges the currnet master branch of https://github.com/k8snetworkplumbingwg/sriov-cni
There were not conflicts reported by git-merge.
The reason for this (aside regular re-sync) is to get k8snetworkplumbingwg/sriov-cni#301 .