[code sync] Merge code from sonic-net/sonic-utilities:202511 to 202603#326
Merged
mssonicbld merged 2 commits intoAzure:202603from May 8, 2026
Merged
[code sync] Merge code from sonic-net/sonic-utilities:202511 to 202603#326mssonicbld merged 2 commits intoAzure:202603from
mssonicbld merged 2 commits intoAzure:202603from
Conversation
Collaborator
mssonicbld
commented
May 8, 2026
mssonicbld
commented
… (#4509)
Cherry-pick of master PRs #4205, #4256, #4294, #4436 onto 202511.
Rewrites fetch_routes() to use ijson streaming JSON parsing instead of
loading the entire FRR routing table into memory. This prevents OOM on
devices with 500K+ routes.
Key changes:
- fetch_routes() uses ijson.kvitems() for incremental parsing via Popen pipe
- Route filtering (connected/kernel/static, VRF, selected) moved into
fetch_routes() to filter during streaming (avoids holding full dict)
- Returns (missing_routes, failing_routes) tuple directly
- missing_routes uses {'prefix': ..., 'protocol': ...} dict format to
preserve compatibility with mitigate_installed_not_offloaded_frr_routes()
- Added ijson>=3.2.3 dependency in setup.py
- New test file: tests/fetch_routes_chunk_test.py (streaming parser tests)
Differences from master:
- missing_routes uses dict format instead of plain prefix strings (master
has a latent bug where mitigate function expects entry['prefix'])
- Parse errors raise RuntimeError (fail-closed) with subprocess cleanup
to avoid pipe deadlock, instead of silently returning empty results
- No unrelated formatting/style changes from master included
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
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
2 participants
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.