[action] [PR:3880] skip pfcwd if disabled in golden_config#178
Merged
mssonicbld merged 1 commit intoAzure:202412from May 14, 2025
Merged
[action] [PR:3880] skip pfcwd if disabled in golden_config#178mssonicbld merged 1 commit intoAzure:202412from
mssonicbld merged 1 commit intoAzure:202412from
Conversation
<!--
Please make sure you've read and understood our contributing guidelines:
https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md
** Make sure all your commits include a signature generated with `git commit -s` **
If this is a bug fix, make sure your description includes "closes #xxxx",
"fixes #xxxx" or "resolves #xxxx" so that GitHub automatically closes the related
issue when the PR is merged.
If you are adding/modifying/removing any command or utility script, please also
make sure to add/modify/remove any unit tests from the tests
directory as appropriate.
If you are modifying or removing an existing 'show', 'config' or 'sonic-clear'
subcommand, or you are adding a new subcommand, please make sure you also
update the Command Line Reference Guide (doc/Command-Reference.md) to reflect
your changes.
Please provide the following information:
-->
## Skip pfcwd config if it's disabled in golden config
In `sudo config load_minigraph --override_config -y`, it will call `pfcwd start_default` by default.
```
Running command: /usr/local/bin/sonic-cfggen -H -m -j /etc/sonic/init_cfg.json --write-to-db
......
Running command: pfcwd start_default
Running command: config override-config-table /etc/sonic/golden_config_db.json
```
When golden_config_db.json has `"default_pfcwd_status": disable`, pfcwd should not be generated in the config.
However, in current code, when `pfcwd start_default` is called, the `default_pfcwd_status` is still using the value in `init_cfg.json` which is `enable`. So, pfcwd configuration is still generated even though it's not needed.
#### What I did
Disable default_pfcwd_status for all lossy platform.
#### How I did it
Check `default_pfcwd_status` in `golden_config_db.json` and skip `pfcwd start_default` if it's disabled.
#### How to verify it
Run deploy-mg on all lossy platform
#### 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)
Collaborator
Author
|
Original PR: sonic-net/sonic-utilities#3880 |
Collaborator
Author
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
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
1 participant
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.
Skip pfcwd config if it's disabled in golden config
In
sudo config load_minigraph --override_config -y, it will callpfcwd start_defaultby default.When golden_config_db.json has
"default_pfcwd_status": disable, pfcwd should not be generated in the config.However, in current code, when
pfcwd start_defaultis called, thedefault_pfcwd_statusis still using the value ininit_cfg.jsonwhich isenable. So, pfcwd configuration is still generated even though it's not needed.What I did
Disable default_pfcwd_status for all lossy platform.
How I did it
Check
default_pfcwd_statusingolden_config_db.jsonand skippfcwd start_defaultif it's disabled.How to verify it
Run deploy-mg on all lossy platform
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)