-
Notifications
You must be signed in to change notification settings - Fork 1.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[docker-orchagent]: Fix qos configuration for TD2 platform #439
[docker-orchagent]: Fix qos configuration for TD2 platform #439
Conversation
@@ -35,14 +35,14 @@ SWSSCONFIG_ARGS="00-copp.config.json " | |||
|
|||
if [ "$HWSKU" == "Force10-S6000" ]; then | |||
ORCHAGENT_ARGS+="-m $MAC_ADDRESS" | |||
SWSSCONFIG_ARGS+="td2.32ports.qos.json td2.32ports.buffers.json " | |||
SWSSCONFIG_ARGS+="td2.32ports.buffers.json td2.32ports.qos.json " |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I want to know more information about this. As I don't see any failures while applying the configurations, why the order of applying these files matters? Are there any dependencies in between some SAI objects? How to ensure the order? I think it is better also to fix the dependency in orchagent code.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think by applying buffer configuration after qos configuration we rewrite "PORT_QOS_MAP_TABLE:*: pfc_enable" settings. At least I see there're issues with pfc frame generation.
Sorry. I don't have more information for you.
Do you remember last time I split the buffer/qos configuration files into chunks? sonic-net/sonic-swss@8056a15
I did this because it was just one possibility to make it working. That time you told me we're having bugs in saibcm.
So this time I believe we have some bugs with saibcm too.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I will double check. Thanks for the information. Please let me hold this pull request for a moment to investigate.
Submodule src/sonic-sairedis d57222a..54b02a1: > Add support for fdb_event MOVE and check fdb event oids (sonic-net#420) > [vslib] add missing port attributes for virtual switch (sonic-net#419) Submodule src/sonic-swss 584490c..62e2a20: > [fdborch] Store vlan id of FDB entry instead of port pvid into stateD… (sonic-net#759) > [portsorch] Change speed set flow (sonic-net#764) > Create egress ACL table group during the PFCWD stats list installment (sonic-net#787) Submodule src/sonic-swss-common 286ef34..2592b0c: > Add support for WarmStart::setDataCheckState() (sonic-net#242) Submodule src/sonic-utilities b44b462..d409987: > [sonic_installer] Improve error handling (sonic-net#460) > [clock] sync os time to CMOS before rebooting (sonic-net#465) > [intfstat] add intfstat script to output RIF counters (sonic-net#439) Signed-off-by: Ying Xie <ying.xie@microsoft.com>
Submodule src/sonic-utilities d409987...ff1448c: > [sonic_installer] Improve error handling (sonic-net#460) > [clock] sync os time to CMOS before rebooting (sonic-net#465) < [sonic_installer] Improve error handling (sonic-net#460) < [clock] sync os time to CMOS before rebooting (sonic-net#465) < [intfstat] add intfstat script to output RIF counters (sonic-net#439) Signed-off-by: Ying Xie <ying.xie@microsoft.com>
…2594) * [201811 submodules] advance sairedis, swss, swss-common, utilities Submodule src/sonic-sairedis d57222a..54b02a1: > Add support for fdb_event MOVE and check fdb event oids (#420) > [vslib] add missing port attributes for virtual switch (#419) Submodule src/sonic-swss 584490c..62e2a20: > [fdborch] Store vlan id of FDB entry instead of port pvid into stateD… (#759) > [portsorch] Change speed set flow (#764) > Create egress ACL table group during the PFCWD stats list installment (#787) Submodule src/sonic-swss-common 286ef34..2592b0c: > Add support for WarmStart::setDataCheckState() (#242) Submodule src/sonic-utilities b44b462..d409987: > [sonic_installer] Improve error handling (#460) > [clock] sync os time to CMOS before rebooting (#465) > [intfstat] add intfstat script to output RIF counters (#439) Signed-off-by: Ying Xie <ying.xie@microsoft.com> * [201811 utilties] add 201811 branch for sonic-utilities repo Submodule src/sonic-utilities d409987...ff1448c: > [sonic_installer] Improve error handling (#460) > [clock] sync os time to CMOS before rebooting (#465) < [sonic_installer] Improve error handling (#460) < [clock] sync os time to CMOS before rebooting (#465) < [intfstat] add intfstat script to output RIF counters (#439) Signed-off-by: Ying Xie <ying.xie@microsoft.com>
…onic-net#2594) * [201811 submodules] advance sairedis, swss, swss-common, utilities Submodule src/sonic-sairedis d57222a..54b02a1: > Add support for fdb_event MOVE and check fdb event oids (sonic-net#420) > [vslib] add missing port attributes for virtual switch (sonic-net#419) Submodule src/sonic-swss 584490c..62e2a20: > [fdborch] Store vlan id of FDB entry instead of port pvid into stateD… (sonic-net#759) > [portsorch] Change speed set flow (sonic-net#764) > Create egress ACL table group during the PFCWD stats list installment (sonic-net#787) Submodule src/sonic-swss-common 286ef34..2592b0c: > Add support for WarmStart::setDataCheckState() (#242) Submodule src/sonic-utilities b44b462..d409987: > [sonic_installer] Improve error handling (sonic-net#460) > [clock] sync os time to CMOS before rebooting (sonic-net#465) > [intfstat] add intfstat script to output RIF counters (sonic-net#439) Signed-off-by: Ying Xie <ying.xie@microsoft.com> * [201811 utilties] add 201811 branch for sonic-utilities repo Submodule src/sonic-utilities d409987...ff1448c: > [sonic_installer] Improve error handling (sonic-net#460) > [clock] sync os time to CMOS before rebooting (sonic-net#465) < [sonic_installer] Improve error handling (sonic-net#460) < [clock] sync os time to CMOS before rebooting (sonic-net#465) < [intfstat] add intfstat script to output RIF counters (sonic-net#439) Signed-off-by: Ying Xie <ying.xie@microsoft.com>
…onic-net#2594) * [201811 submodules] advance sairedis, swss, swss-common, utilities Submodule src/sonic-sairedis d57222a..54b02a1: > Add support for fdb_event MOVE and check fdb event oids (sonic-net#420) > [vslib] add missing port attributes for virtual switch (sonic-net#419) Submodule src/sonic-swss 584490c..62e2a20: > [fdborch] Store vlan id of FDB entry instead of port pvid into stateD… (sonic-net#759) > [portsorch] Change speed set flow (sonic-net#764) > Create egress ACL table group during the PFCWD stats list installment (sonic-net#787) Submodule src/sonic-swss-common 286ef34..2592b0c: > Add support for WarmStart::setDataCheckState() (#242) Submodule src/sonic-utilities b44b462..d409987: > [sonic_installer] Improve error handling (sonic-net#460) > [clock] sync os time to CMOS before rebooting (sonic-net#465) > [intfstat] add intfstat script to output RIF counters (sonic-net#439) Signed-off-by: Ying Xie <ying.xie@microsoft.com> * [201811 utilties] add 201811 branch for sonic-utilities repo Submodule src/sonic-utilities d409987...ff1448c: > [sonic_installer] Improve error handling (sonic-net#460) > [clock] sync os time to CMOS before rebooting (sonic-net#465) < [sonic_installer] Improve error handling (sonic-net#460) < [clock] sync os time to CMOS before rebooting (sonic-net#465) < [intfstat] add intfstat script to output RIF counters (sonic-net#439) Signed-off-by: Ying Xie <ying.xie@microsoft.com>
…onic-net#2594) * [201811 submodules] advance sairedis, swss, swss-common, utilities Submodule src/sonic-sairedis d57222a..54b02a1: > Add support for fdb_event MOVE and check fdb event oids (sonic-net#420) > [vslib] add missing port attributes for virtual switch (sonic-net#419) Submodule src/sonic-swss 584490c..62e2a20: > [fdborch] Store vlan id of FDB entry instead of port pvid into stateD… (sonic-net#759) > [portsorch] Change speed set flow (sonic-net#764) > Create egress ACL table group during the PFCWD stats list installment (sonic-net#787) Submodule src/sonic-swss-common 286ef34..2592b0c: > Add support for WarmStart::setDataCheckState() (#242) Submodule src/sonic-utilities b44b462..d409987: > [sonic_installer] Improve error handling (sonic-net#460) > [clock] sync os time to CMOS before rebooting (sonic-net#465) > [intfstat] add intfstat script to output RIF counters (sonic-net#439) Signed-off-by: Ying Xie <ying.xie@microsoft.com> * [201811 utilties] add 201811 branch for sonic-utilities repo Submodule src/sonic-utilities d409987...ff1448c: > [sonic_installer] Improve error handling (sonic-net#460) > [clock] sync os time to CMOS before rebooting (sonic-net#465) < [sonic_installer] Improve error handling (sonic-net#460) < [clock] sync os time to CMOS before rebooting (sonic-net#465) < [intfstat] add intfstat script to output RIF counters (sonic-net#439) Signed-off-by: Ying Xie <ying.xie@microsoft.com>
* [intfstat] 'add show interface counters rif' Signed-off-by: Mykola Faryma <mykolaf@mellanox.com> * [rif counters] add unittests Signed-off-by: Mykola Faryma <mykolaf@mellanox.com> * [setup] add test dependencies packages(mock, mockredipy) Signed-off-by: Mykola Faryma <mykolaf@mellanox.com> * [intfstat] add alias mode support Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>
Includes sonic-swss-common commits: ``` 71dc350 2021-01-07 | Lower the log level for outdated key for SubscriberStateTable notification (sonic-net#441) [Qi Luo] 7e40582 2021-01-08 | Add boost dependencies (sonic-net#442) [Ze Gan] 30a8ddf 2021-01-05 | Change DBConnector::hgetall return type from map to unordered_map (sonic-net#440) [Qi Luo] 021108d 2021-01-02 | MCLAG Enhancements per HLD sonic-net/SONiC#596 (sonic-net#405) [Praveen-Brcm] 54996fc 2021-01-02 | Implement ConfigDBConnector and ConfigDBPipeConnector in C++ (sonic-net#437) [Qi Luo] 8286525 2020-12-27 | Simply refactor DBConnector hgetall() [Qi Luo] 6d1d33b 2020-12-27 | Fix RedisTransactioner: handle empty deque [Qi Luo] 624e0b8 2020-12-26 | Move complex class constructor as explicit, and fix several mistaken copy constructor usage [Qi Luo] 3b983f9 2020-12-30 | [ci]: add timeout to 180 minutes for arm build (sonic-net#439) [lguohan] f2e4210 2020-12-29 | Add utility for string and redis (sonic-net#434) [Ze Gan] 7a885fd 2020-12-29 | [build]: add build check for arm64 and armhf (sonic-net#436) [lguohan] 47bccc4 2020-12-24 | Add missed vector header to rediscommand.h (sonic-net#435) [Ze Gan] ```
Includes sonic-swss-common commits: ``` 71dc350 2021-01-07 | Lower the log level for outdated key for SubscriberStateTable notification (#441) [Qi Luo] 7e40582 2021-01-08 | Add boost dependencies (#442) [Ze Gan] 30a8ddf 2021-01-05 | Change DBConnector::hgetall return type from map to unordered_map (#440) [Qi Luo] 021108d 2021-01-02 | MCLAG Enhancements per HLD sonic-net/SONiC#596 (#405) [Praveen-Brcm] 54996fc 2021-01-02 | Implement ConfigDBConnector and ConfigDBPipeConnector in C++ (#437) [Qi Luo] 8286525 2020-12-27 | Simply refactor DBConnector hgetall() [Qi Luo] 6d1d33b 2020-12-27 | Fix RedisTransactioner: handle empty deque [Qi Luo] 624e0b8 2020-12-26 | Move complex class constructor as explicit, and fix several mistaken copy constructor usage [Qi Luo] 3b983f9 2020-12-30 | [ci]: add timeout to 180 minutes for arm build (#439) [lguohan] f2e4210 2020-12-29 | Add utility for string and redis (#434) [Ze Gan] 7a885fd 2020-12-29 | [build]: add build check for arm64 and armhf (#436) [lguohan] 47bccc4 2020-12-24 | Add missed vector header to rediscommand.h (#435) [Ze Gan] ```
Includes sonic-swss-common commits: ``` 71dc350 2021-01-07 | Lower the log level for outdated key for SubscriberStateTable notification (#441) [Qi Luo] 7e40582 2021-01-08 | Add boost dependencies (#442) [Ze Gan] 30a8ddf 2021-01-05 | Change DBConnector::hgetall return type from map to unordered_map (#440) [Qi Luo] 021108d 2021-01-02 | MCLAG Enhancements per HLD sonic-net/SONiC#596 (#405) [Praveen-Brcm] 54996fc 2021-01-02 | Implement ConfigDBConnector and ConfigDBPipeConnector in C++ (#437) [Qi Luo] 8286525 2020-12-27 | Simply refactor DBConnector hgetall() [Qi Luo] 6d1d33b 2020-12-27 | Fix RedisTransactioner: handle empty deque [Qi Luo] 624e0b8 2020-12-26 | Move complex class constructor as explicit, and fix several mistaken copy constructor usage [Qi Luo] 3b983f9 2020-12-30 | [ci]: add timeout to 180 minutes for arm build (#439) [lguohan] f2e4210 2020-12-29 | Add utility for string and redis (#434) [Ze Gan] 7a885fd 2020-12-29 | [build]: add build check for arm64 and armhf (#436) [lguohan] 47bccc4 2020-12-24 | Add missed vector header to rediscommand.h (#435) [Ze Gan] ```
We must apply buffer configuration before qos configuration