Fixes QoS scheduler config on chips that do not support hierarchical scheduler #2674
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
|
@prsunny, @bingwang-ms, @neethajohn, Can you help assign a reviewer to review this PR, please. This PR is useful to resolve scheduler configuration issues. |
stephenxs
suggested changes
Apr 3, 2023
| @@ -1590,9 +1590,19 @@ bool QosOrch::applySchedulerToQueueSchedulerGroup(Port &port, size_t queue_ind, | |||
| attr.value.oid = scheduler_profile_id; | |||
|
|
|||
| sai_status = sai_scheduler_group_api->set_scheduler_group_attribute(group_id, &attr); | |||
| if (SAI_STATUS_NOT_SUPPORTED != sai_status) | |||
There was a problem hiding this comment.
Suggest using
if (SAI_STATUS_IS_ATTR_NOT_SUPPORTED(status) || SAI_STATUS_IS_ATTR_NOT_IMPLEMENTED(status)
|| status == SAI_STATUS_NOT_SUPPORTED || status == SAI_STATUS_NOT_IMPLEMENTED)
Refer https://github.com/sonic-net/sonic-swss/blob/master/orchagent/switchorch.cpp#L678 as an example.
There was a problem hiding this comment.
Thank you for reviewing. This condition "SAI_STATUS_NOT_SUPPORTED != sai_status" was not right in the first place. Will fix this.
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.
What I did
This PR fixes QoS scheduler configuration failure on chips that do not support hierarchical scheduling
Why I did it
Scheduler configuration using scheduler_group SAI API fails on chips such as BCM56275 which does not support hierarchical scheduling. On these chips, scheduler_group SAI API returns error (SAI_STATUS_NOT_SUPPORTED) because it does not support L2 level scheduler configuration. On these chips, we need to use QUEUE SAI API instead to configure scheduling at the queue level.
How I verified it
Refer to UT-sairedis-log.txt
Details if related
config.txt
UT-sairedis-log.txt