Revert "[buffer orch] Bugfix: Don't query counter SAI_BUFFER_POOL_STA…#1945
Merged
vaibhavhd merged 1 commit intosonic-net:masterfrom Oct 6, 2021
Merged
Revert "[buffer orch] Bugfix: Don't query counter SAI_BUFFER_POOL_STA…#1945vaibhavhd merged 1 commit intosonic-net:masterfrom
vaibhavhd merged 1 commit intosonic-net:masterfrom
Conversation
…T_XOFF_ROOM_WATERMARK_BYTES on a pool where it is not supported (sonic-net#1857)" This reverts commit 3d6b1f0.
neethajohn
approved these changes
Oct 6, 2021
Contributor
|
@stephenxs , issue is reproducible by issuing a warm reboot on kvm image based off master branch |
5 tasks
judyjoseph
pushed a commit
that referenced
this pull request
Oct 7, 2021
…T_XOFF_ROOM_WATERMARK_BYTES on a pool where it is not supported (#1857)" (#1945) This reverts commit 3d6b1f0. Fix sonic-net/sonic-buildimage#8893 What I did This commit had earlier caused issue on master image warmboot - sonic-net/sonic-buildimage#8722 To fix this issue, this PR was created to retreat sonic-swss head on buildimage - sonic-net/sonic-buildimage#8732 Now, this commit was again pulled into sonic-buildimage as part of sonic-swss submodule advance: sonic-net/sonic-buildimage#8839 And, warm-reboot again broke for the same reason. This change is so that any other swss submodule update on buildimage will not fail warmboot again.
vaibhavhd
added a commit
to sonic-net/sonic-buildimage
that referenced
this pull request
Oct 9, 2021
[Submodule advance sonic-swss] Include below commits to master image: Cache routes for single nexthop for faster retrieval sonic-net/sonic-swss#1922 Reduce route count for route perf test (sonic-net/sonic-swss#1928) [pytest]: Re-use DVS container when possible (sonic-net/sonic-swss#1816) [PORTSYNCD] when no ports on config db on init, continue and set Port… (sonic-net/sonic-swss#1861) [gearbox] Add gearbox unit test (sonic-net/sonic-swss#1920) Reverted skipped test_buffer_dynamic test cases (sonic-net/sonic-swss#1937) Revert "[buffer orch] Bugfix: Don't query counter SAI_BUFFER_POOL_STA… (sonic-net/sonic-swss#1945)
stephenxs
added a commit
to stephenxs/sonic-swss
that referenced
this pull request
Dec 14, 2021
…POOL_STAT_XOFF_ROOM_WATERMARK_BYTES on a pool where it is not supported (sonic-net#1857)" (sonic-net#1945)" This reverts commit 94d2d44.
Janetxxx
pushed a commit
to Janetxxx/sonic-swss
that referenced
this pull request
Nov 10, 2025
…T_XOFF_ROOM_WATERMARK_BYTES on a pool where it is not supported (sonic-net#1857)" (sonic-net#1945) This reverts commit 3d6b1f0. Fix sonic-net/sonic-buildimage#8893 What I did This commit had earlier caused issue on master image warmboot - sonic-net/sonic-buildimage#8722 To fix this issue, this PR was created to retreat sonic-swss head on buildimage - sonic-net/sonic-buildimage#8732 Now, this commit was again pulled into sonic-buildimage as part of sonic-swss submodule advance: sonic-net/sonic-buildimage#8839 And, warm-reboot again broke for the same reason. This change is so that any other swss submodule update on buildimage will not fail warmboot again.
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
2 participants
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.
…T_XOFF_ROOM_WATERMARK_BYTES on a pool where it is not supported (#1857)"
This reverts commit 3d6b1f0.
Fix sonic-net/sonic-buildimage#8893
What I did
This commit had earlier caused issue on master image warmboot -
sonic-net/sonic-buildimage#8722
To fix this issue, this PR was created to retreat sonic-swss head on buildimage -
sonic-net/sonic-buildimage#8732
Now, this commit was again pulled into sonic-buildimage as part of sonic-swss submodule advance:
sonic-net/sonic-buildimage#8839
And, warm-reboot again broke for the same reason.
This PR reverts the commit on sonic-swss, so that any other submodule update on buildimage will not fail warmboot again.
Why I did it
How I verified it
Details if related