kubeovn / kube-ovn / 22985042443

23%

master: 23%

Build Type

push

github

Committed by oilbeater

Commit Message

fix: use targeted patch in calcSubnetStatusIP to prevent U2O status overwrite (#6350)

calcSubnetStatusIP previously used subnet.Status.Bytes() which serialized
the entire SubnetStatus and patched all fields to etcd. This caused a race
condition where handleUpdateSubnetStatus could overwrite U2OInterconnectionVPC
with stale data from its informer cache, leading to flaky e2e test failures
in "should support underlay to overlay subnet interconnection".

The race condition occurs when:
1. handleAddOrUpdateSubnet sets U2OInterconnectionVPC and patches status
2. handleUpdateSubnetStatus retries (from IP inconsistency requeue), reads
   stale cache without U2OInterconnectionVPC, and calcSubnetStatusIP
   overwrites all status fields including U2OInterconnectionVPC=""

Fix by using a targeted JSON merge patch that only includes the 8 IP-related
fields, leaving non-IP fields like U2OInterconnectionVPC untouched.

Signed-off-by: Mengxin Liu <liumengxinfly@gmail.com>
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

Run Details

0 of 24 new or added lines in 1 file covered. (0.0%)

2 existing lines in 1 file now uncovered.

12501 of 54300 relevant lines covered (23.02%)

0.27 hits per line