kubeovn / kube-ovn / 31365085020

30%

master: 34%

Build Type

push

github

Committed by web-flow

Commit Message

[release-1.16] ipam: align dual-stack family preservation (#7190)

* ipam: restore counter views when preserving the other family's static address (#7187)

In a dual-stack subnet, `GetStaticAddress` replacing one family's static address
preserves the other. The preserve path calls `releaseAddr` and restores only the
lookup maps, not the counter sets, so the preserved address stays in
`Available`/`Released` and out of `Using`. Once the pool exhausts and recycles
from `Released`, a later random allocation can hand the still-configured address
to another pod, causing a duplicate address and drifting `usingIPs`/`availableIPs`.

Restore the counter views with the maps: re-add the address to `Using` and
remove it from `Available`/`Released` at subnet and pool level, mirroring
`releaseV4Addr`/`releaseV6Addr`. The set operations are idempotent, so the
out-of-CIDR/reserved and multi-owner paths are unaffected.

Signed-off-by: kiarash <kiarash.azarnia@gmail.com>
(cherry picked from commit abab3df20)
Signed-off-by: zhangzujian <zhangzujian.7@gmail.com>
Signed-off-by: Kiarash <48817462+kiarashazarnia@users.noreply.github.com>

* ipam: align dual-stack family preservation (#7189)

Reuse family-specific lease release for static address replacement instead of releasing the whole NIC and rebuilding the preserved family state. Split the allocation flow and regression tests into focused helpers.

Cover skipped-address retries for IPv4, IPv6, and both families in default and named pools.

Signed-off-by: zhangzujian <zhangzujian.7@gmail.com>
(cherry picked from commit c79de0bd5)
Signed-off-by: zhangzujian <zhangzujian.7@gmail.com>

---------

Signed-off-by: kiarash <kiarash.azarnia@gmail.com>
Signed-off-by: zhangzujian <zhangzujian.7@gmail.com>
Signed-off-by: Kiarash <48817462+kiarashazarnia@users.noreply.github.com>
Co-authored-by: Kiarash <48817462+kiarashazarnia@users.noreply.github.com>

Coverage Stats

153 of 182 new or added lines in 1 file covered. (84.07%)

2 existing lines in 1 file now uncovered.

16605 of 58216 relevant lines covered (28.52%)

0.33 hits per line