global-monitor: fix crash when IBRL and multicast users share a client IP#3142
Merged
global-monitor: fix crash when IBRL and multicast users share a client IP#3142
Conversation
…xist When a client has both IBRL and Multicast user accounts sharing the same client IP, the UsersByClientIP map would keep whichever was iterated last. If the multicast user won, its device code would mismatch the status device code (which correctly prefers non-multicast tunnels), crashing the global monitor on startup. Populate User.UserType from RPC data and prefer non-multicast users in the UsersByClientIP map, matching parseStatus behavior.
packethog
approved these changes
Feb 28, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary of Changes
frankryfor IBRL vsfr2-dzx-001for Multicast)UsersByClientIPmap could arbitrarily return the Multicast user, whose device code mismatches the status device code (which correctly prefers the non-multicast tunnel), causing a fatal"user device code does not match status device code"errorUser.UserTypefrom onchain data (was previously always zero-value) and prefer non-multicast users in theUsersByClientIPmap, matching the existingparseStatuslogicDiff Breakdown
Small targeted bugfix with thorough test coverage.
Key files (click to expand)
telemetry/global-monitor/internal/dz/serviceability_test.go— add test for duplicate client IP scenario verifying non-multicast user is preferredtelemetry/global-monitor/internal/dz/serviceability.go— populate UserType field, prefer non-multicast user in UsersByClientIP mapTesting Verification
serviceabilityandstatustests pass