Read tables in insertion order in ConfigDBConnector.mod_config() #1043
Conversation
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
When the SWSS SDK was ported to C++, one of the effects is that the map of tables passed in to mod_config() is now converted to a std::map by SWIG. Iteration over std::map always happens in lexical order of the table names, which causes issues for frrcfgd when one table depend on the contents of the another (e.g. PREFIX depends on PREFIX_SET, but PREFIX sorts before PREFIX_SET.) This adds an overload to mod_config() that takes in an unsorted_map of the config data, along with a vector specifying the order in which to read the tables. The Python implementation is adjusted to always use the new function, to preserve the dictionary insertion order. Fixes sonic-net/sonic-buildimage#22974
The committers listed above are authorized under a signed CLA. |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
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.
When the SWSS SDK was ported to C++, one of the effects is that the map of tables passed in to mod_config() is now converted to a std::map by SWIG. Iteration over std::map always happens in lexical order of the table names, which causes issues for frrcfgd when one table depend on the contents of the another (e.g. PREFIX depends on PREFIX_SET, but PREFIX sorts before PREFIX_SET.)
This adds an overload to mod_config() that takes in an unsorted_map of the config data, along with a vector specifying the order in which to read the tables. The Python implementation is adjusted to always use the new function, to preserve the dictionary insertion order.
Fixes sonic-net/sonic-buildimage#22974