Skip to content
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

Adjust 7260 buffer sizes to accomodate extra lossless queues #11018

Merged
merged 7 commits into from
Jun 6, 2022

Conversation

neethajohn
Copy link
Contributor

@neethajohn neethajohn commented Jun 2, 2022

Why I did it

As part of PCBB changes, we need to enable 2 extra lossless queues. The changes in this PR are done to adjust only the reserved sizes on Th2 for the additional 2 lossless queues
Calculations are done based on 40 downlinks for T1 and 16 uplinks for dual ToR

How to verify it

  • Verified that the rendering works fine on Th2 dut
  • Unit tests have been updated to reflect the modified buffer sizes when pcbb is enabled. There are existing testcases that will test the original buffer sizes when pcbb is disabled. With these changes, was able to build sonic-config-engine wheel successfully

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111

Signed-off-by: Neetha John <[email protected]>
@neethajohn neethajohn marked this pull request as ready for review June 3, 2022 16:30
@neethajohn neethajohn requested review from a team as code owners June 3, 2022 16:30
@neethajohn neethajohn requested a review from baiwei0427 June 3, 2022 16:32
yxieca
yxieca previously approved these changes Jun 3, 2022
@lguohan lguohan merged commit 453504f into sonic-net:master Jun 6, 2022
lguohan pushed a commit that referenced this pull request Jun 6, 2022
…11018)

Why I did it
As part of PCBB changes, we need to enable 2 extra lossless queues. The changes in this PR are done to adjust only the reserved sizes on Th2 for the additional 2 lossless queues
Calculations are done based on 40 downlinks for T1 and 16 uplinks for dual ToR

How to verify it
Verified that the rendering works fine on Th2 dut
Unit tests have been updated to reflect the modified buffer sizes when pcbb is enabled. There are existing testcases that will test the original buffer sizes when pcbb is disabled. With these changes, was able to build sonic-config-engine wheel successfully

Signed-off-by: Neetha John <[email protected]>
@lguohan
Copy link
Collaborator

lguohan commented Jun 6, 2022

for 202012 branch, only includes the template change, didn't include the unit tests.

@stephenxs
Copy link
Collaborator

for 202012 branch, only includes the template change, didn't include the unit tests.

@lguohan @neethajohn looks like it's failing the sonic-config-gen test on 202012 branch if we do not update the unit test.

lguohan added a commit that referenced this pull request Jun 6, 2022
…queues (#11018)"

This reverts commit 21f14dc.

unit test needs to be cherry-picked.
@lguohan
Copy link
Collaborator

lguohan commented Jun 6, 2022

@stephenxs , you are right, i reverted that pr, and @neethajohn , can you generate a 202012 branch pr thanks.

@stephenxs
Copy link
Collaborator

@stephenxs , you are right, i reverted that pr, and @neethajohn , can you generate a 202012 branch pr thanks.

Thank you.

@neethajohn
Copy link
Contributor Author

@stephenxs , you are right, i reverted that pr, and @neethajohn , can you generate a 202012 branch pr thanks.

PR for 202012: #11050

neethajohn added a commit that referenced this pull request Jun 7, 2022
…#11050)

Backport changes from #11018

Signed-off-by: Neetha John <[email protected]>

Why I did it
As part of PCBB changes, we need to enable 2 extra lossless queues. The changes in this PR are done to adjust only the reserved sizes on Th2 for the additional 2 lossless queues
Calculations are done based on 40 downlinks for T1 and 16 uplinks for dual ToR

How to verify it
Verified that the rendering works fine on Th2 dut
Unit tests have been updated to reflect the modified buffer sizes when pcbb is enabled. There are existing testcases that will test the original buffer sizes when pcbb is disabled. With these changes, was able to build sonic-config-engine wheel successfully
@qiluo-msft
Copy link
Collaborator

This commit could not be cleanly cherry-picked to 202012. Please submit another PR.

yxieca pushed a commit that referenced this pull request Jun 23, 2022
…11018)

Why I did it
As part of PCBB changes, we need to enable 2 extra lossless queues. The changes in this PR are done to adjust only the reserved sizes on Th2 for the additional 2 lossless queues
Calculations are done based on 40 downlinks for T1 and 16 uplinks for dual ToR

How to verify it
Verified that the rendering works fine on Th2 dut
Unit tests have been updated to reflect the modified buffer sizes when pcbb is enabled. There are existing testcases that will test the original buffer sizes when pcbb is disabled. With these changes, was able to build sonic-config-engine wheel successfully

Signed-off-by: Neetha John <[email protected]>
skbarista pushed a commit to skbarista/sonic-buildimage that referenced this pull request Aug 17, 2022
…onic-net#11018)

Why I did it
As part of PCBB changes, we need to enable 2 extra lossless queues. The changes in this PR are done to adjust only the reserved sizes on Th2 for the additional 2 lossless queues
Calculations are done based on 40 downlinks for T1 and 16 uplinks for dual ToR

How to verify it
Verified that the rendering works fine on Th2 dut
Unit tests have been updated to reflect the modified buffer sizes when pcbb is enabled. There are existing testcases that will test the original buffer sizes when pcbb is disabled. With these changes, was able to build sonic-config-engine wheel successfully

Signed-off-by: Neetha John <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants