containernetworking / plugins / 39930316601

53%

master: 55%

Pull #1282

github

plugins/vrf: make DEL idempotent when the device is already gone

During concurrent pod-netns teardown the VRF can be removed between
findVRF and LinkDel, so LinkDel(vrf) returns ENODEV. cmdDel propagated
that error and (under Multus/libcni) aborted the conflist DEL before the
chained macvlan DEL ran, orphaning the interface and leaking its netns.
resetMaster had the same problem when the enslaved interface was already
gone, and additionally masked the underlying error by not wrapping it.

Per the CNI SPEC, DEL is best-effort and must not fail when a resource
has already been removed. Treat "link not found" as success on both
LinkDel and resetMaster, matching by errno (ENODEV/ENOENT) as well as
the typed LinkNotFoundError -- LinkDel returns a bare errno, so a
type-only check misses it. Also switch the existing findVRF guard to the
shared helper and wrap resetMaster errors with %w.

Signed-off-by: Bryant Ly <bly@coreweave.com>

17 of 20 new or added lines in 2 files covered. (85.0%)

5187 of 9760 relevant lines covered (53.15%)

29.06 hits per line