[qos reload] Fix "config qos reload" overriding entire CONFIG_DB #3479
Conversation
This file contains 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
Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
|
Request for 202405 |
dgsudharsan
approved these changes
Aug 16, 2024
liat-grozovik
approved these changes
Sep 3, 2024
mssonicbld
pushed a commit
to mssonicbld/sonic-utilities
that referenced
this pull request
Sep 6, 2024
…ic-net#3479) Fixes sonic-net/sonic-buildimage#15894 - What I did config qos reload command uses a combination of sonic-cfggen's flags -d and --write-to-db that makes it override entire CONFIG_DB, updating every key. This leads to issues with Orchs, daemons that do not support updating keys in CONFIG_DB. Best case, it causes errors in logs. - How I did it First, render templates to temporary files, then load those files into CONFIG_DB. Also, fixed an issue where using dry_run option only produced QOS config but not the buffer configuration and updated test files accordingly. - How to verify it Run on switch: root@sonic/home/admin# config qos reload Running command: /usr/local/bin/sonic-cfggen -d -t /usr/share/sonic/device/x86_64-mlnx_msn2100-r0/ACS-MSN2100/buffers_dynamic.json.j2,/tmp/cfg_buffer.json -t /usr/share/sonic/device/x86_64-mlnx_msn2100-r0/ACS-MSN2100/qos.json.j2,/tmp/cfg_qos.json -y /etc/sonic/sonic_version.yml Running command: /usr/local/bin/sonic-cfggen -j /tmp/cfg_buffer.json -j /tmp/cfg_qos.json --write-to-db Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
|
Cherry-pick PR to 202405: #3532 |
mssonicbld
pushed a commit
that referenced
this pull request
Sep 6, 2024
Fixes sonic-net/sonic-buildimage#15894 - What I did config qos reload command uses a combination of sonic-cfggen's flags -d and --write-to-db that makes it override entire CONFIG_DB, updating every key. This leads to issues with Orchs, daemons that do not support updating keys in CONFIG_DB. Best case, it causes errors in logs. - How I did it First, render templates to temporary files, then load those files into CONFIG_DB. Also, fixed an issue where using dry_run option only produced QOS config but not the buffer configuration and updated test files accordingly. - How to verify it Run on switch: root@sonic/home/admin# config qos reload Running command: /usr/local/bin/sonic-cfggen -d -t /usr/share/sonic/device/x86_64-mlnx_msn2100-r0/ACS-MSN2100/buffers_dynamic.json.j2,/tmp/cfg_buffer.json -t /usr/share/sonic/device/x86_64-mlnx_msn2100-r0/ACS-MSN2100/qos.json.j2,/tmp/cfg_qos.json -y /etc/sonic/sonic_version.yml Running command: /usr/local/bin/sonic-cfggen -j /tmp/cfg_buffer.json -j /tmp/cfg_qos.json --write-to-db Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
mssonicbld
added
Included in 202405 Branch
and removed
Created PR to 202405 Branch
labels
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.
Fixes sonic-net/sonic-buildimage#15894
What I did
config qos reloadcommand uses a combination ofsonic-cfggen's flags-dand--write-to-dbthat makes it override entire CONFIG_DB, updating every key. This leads to issues with Orchs, daemons that do not support updating keys in CONFIG_DB. Best case, it causes errors in logs.How I did it
First, render templates to temporary files, then load those files into CONFIG_DB.
Also, fixed an issue where using
dry_runoption only produced QOS config but not the buffer configuration and updated test files accordingly.How to verify it
Run on switch:
Previous command output (if the output of a command-line utility has changed)
New command output (if the output of a command-line utility has changed)