Skip to content

fix(saiserver): guard LAG memberships with a mutex and clear them on reset - #765

Open
mohankarthik wants to merge 1 commit into
openconfig:mainfrom
mohankarthik:split/pr4-lag-membership-safety
Open

mohankarthik wants to merge 1 commit into
openconfig:mainfrom
mohankarthik:split/pr4-lag-membership-safety

Conversation

@mohankarthik

Copy link
Copy Markdown
Contributor

The lag server's memberships map is mutated from concurrent
CreateLagMember/RemoveLagMember gRPC handlers without synchronization,
RemoveLagMember never forgets a removed membership, and saiSwitch.Reset
(called from SAI re-initialization together with attrmgr.Reset, which
restarts OID allocation) never resets the lag server. After a reset,
stale memberships keyed by recycled OIDs can make RemoveLagMember detach
the wrong port from the wrong LAG.

  • Add lag.mu and take it in Reset, CreateLagMember and RemoveLagMember.
  • Claim (delete) the membership under the lock in RemoveLagMember and
    restore it if the dataplane AggregateDel fails, so the removal can be
    retried.
  • Call sw.Lag.Reset() from saiSwitch.Reset().

Adds TestRemoveLagMemberForgetsMembership,
TestRemoveLagMemberRetryAfterDataplaneError,
TestSwitchResetClearsLagMemberships and TestLagMemberConcurrent (run
with -race).

…reset

The lag server's memberships map is mutated from concurrent
CreateLagMember/RemoveLagMember gRPC handlers without synchronization,
RemoveLagMember never forgets a removed membership, and saiSwitch.Reset
(called from SAI re-initialization together with attrmgr.Reset, which
restarts OID allocation) never resets the lag server. After a reset,
stale memberships keyed by recycled OIDs can make RemoveLagMember detach
the wrong port from the wrong LAG.

- Add lag.mu and take it in Reset, CreateLagMember and RemoveLagMember.
- Claim (delete) the membership under the lock in RemoveLagMember and
  restore it if the dataplane AggregateDel fails, so the removal can be
  retried.
- Call sw.Lag.Reset() from saiSwitch.Reset().

Adds TestRemoveLagMemberForgetsMembership,
TestRemoveLagMemberRetryAfterDataplaneError,
TestSwitchResetClearsLagMemberships and TestLagMemberConcurrent (run
with -race).
@mohankarthik
mohankarthik force-pushed the split/pr4-lag-membership-safety branch from 60ff39b to fc8c257 Compare October 26, 2026 04:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant