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

Revert "[buffer orch] Bugfix: Don't query counter SAI_BUFFER_POOL_STA… #1945

Merged
merged 1 commit into from
Oct 6, 2021

Conversation

vaibhavhd
Copy link
Contributor

…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

…T_XOFF_ROOM_WATERMARK_BYTES on a pool where it is not supported (sonic-net#1857)"

This reverts commit 3d6b1f0.
@neethajohn
Copy link
Contributor

@stephenxs , issue is reproducible by issuing a warm reboot on kvm image based off master branch

@vaibhavhd vaibhavhd merged commit 94d2d44 into sonic-net:master Oct 6, 2021
@vaibhavhd vaibhavhd deleted the revert-3d6b1f0 branch October 6, 2021 23:12
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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[warmboot] swss crash due to translateVidToRid error for SAI_OBJECT_TYPE_BUFFER_POOL
2 participants