kubeovn / kube-ovn / 23172458650

23%

Build Type

push

github

Committed by web-flow

Commit Message

fix: restore NIC name during provider network cleanup in exchangeLinkName mode (#6455)

* fix: restore NIC name during provider network cleanup in exchangeLinkName mode

When exchangeLinkName is enabled, ovsInitProviderNetwork renames the
NIC (e.g., eth1 → br-pn-{id}) before creating the OVS bridge. If
bridge creation fails (waitForBridgeInterface timeout), the mapping is
never stored in ovn-bridge-mappings because addOvnMapping is only
reached after successful bridge setup.

During cleanup, ovsCleanProviderNetwork falls back to
ExternalBridgeName(provider) as brName when the mapping is empty. The
existing rename check (br != brName) always evaluates to false since
both values are ExternalBridgeName(provider), leaving the renamed NIC
orphaned. This blocks subsequent provider network tests from using the
NIC and causes cascading failures.

Pass the original NIC name from the ProviderNetwork spec to
ovsCleanProviderNetwork. When the mapping is empty, no OVS bridge is
found, and the fallback name equals ExternalBridgeName, use the
provided NIC name to restore the link via changeProviderNicName. This
is safe because changeProviderNicName is a no-op when the source link
does not exist or is an openvswitch interface.

Signed-off-by: Mengxin Liu <liumengxinfly@gmail.com>

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Mengxin Liu <liumengxinfly@gmail.com>

* fix: prevent stale OVS netdev cache from blocking exchange-link-name bridge creation

When a ProviderNetwork is being deleted, a requeue from a previous error
could trigger handleAddOrUpdateProviderNetwork to re-init instead of
clean up (DeletionTimestamp was not checked). This re-init briefly adds
the NIC as a "system" type port to OVS, creating a netdev cache entry.
If the NIC device is destroyed (docker disconnect) before OVS processes
the port removal, the stale netdev persists. When the next test creates
an exchange-link-name bridge with the same NIC name, OVS re... (continued)

Run Details

0 of 21 new or added lines in 2 files covered. (0.0%)

1 existing line in 1 file now uncovered.

12827 of 54838 relevant lines covered (23.39%)

0.27 hits per line