Skip to content

Add buffer pool watermark support#853

Merged
wendani merged 16 commits intosonic-net:masterfrom
wendani:buf_pool_wm_master
Jun 14, 2019
Merged

Add buffer pool watermark support#853
wendani merged 16 commits intosonic-net:masterfrom
wendani:buf_pool_wm_master

Conversation

@wendani
Copy link
Contributor

@wendani wendani commented Apr 23, 2019

  1. Write fields to FLEX_COUNTER_GROUP_TABLE at the construction of a BufferOrch object:

    "POLL_INTERVAL"
    "BUFFER_POLL_PLUGIN_LIST"
    "STATS_MODE"

  2. Update buffer pool name to oid mapping in COUNTERS_DB upon the set and del of its oid

  3. Push buffer pool watermark COUNTER_ID_LIST to FLEX_COUNTER_TABLE

  4. Implement user clear logic to buffer pool watermark

  5. Add periodic clear to buffer pool watermark

  6. Add lua script for watermark_bufferpool

What I did

Why I did it

How I verified it
On brcm dut
Details if related
Depend on:
sonic-net/sonic-swss-common#272 Add schema for buffer pool watermark
sonic-net/sonic-buildimage#2818 Feed device info to orchagent process

Alongside:
sonic-net/sonic-sairedis#451 Add buffer pool stat to flex counter architecture

Downstream changes:
sonic-net/sonic-utilities#521 Add buffer pool watermark support in watermarkstat and counterpoll

syncd rpc support:
opencomputeproject/SAI#949

wendani added 12 commits April 23, 2019 18:48
a BufferOrch object:

"POLL_INTERVAL"
"BUFFER_POLL_PLUGIN_LIST"
"STATS_MODE"

Signed-off-by: Wenda Ni <wenni@microsoft.com>
…d del of its oid

Signed-off-by: Wenda Ni <wenni@microsoft.com>
Signed-off-by: Wenda Ni <wenni@microsoft.com>
Signed-off-by: Wenda Ni <wenni@microsoft.com>
Signed-off-by: Wenda Ni <wenni@microsoft.com>
Signed-off-by: Wenda Ni <wenni@microsoft.com>
Signed-off-by: Wenda Ni <wenni@microsoft.com>
Signed-off-by: Wenda Ni <wenni@microsoft.com>
Signed-off-by: Wenda Ni <wenni@microsoft.com>
Signed-off-by: Wenda Ni <wenni@microsoft.com>
Signed-off-by: Wenda Ni <wenni@microsoft.com>
Signed-off-by: Wenda Ni <wenni@microsoft.com>
@wendani wendani requested review from lguohan and qiluo-msft April 23, 2019 22:21
@wendani
Copy link
Contributor Author

wendani commented Apr 23, 2019

@mykolaf for review

@wendani wendani requested a review from qiluo-msft May 31, 2019 03:53
Signed-off-by: Wenda Ni <wenni@microsoft.com>
@sonic-net sonic-net deleted a comment from lguohan Jun 12, 2019
@wendani wendani requested a review from qiluo-msft June 12, 2019 23:06
@wendani
Copy link
Contributor Author

wendani commented Jun 14, 2019

retest this please

@wendani wendani merged commit 4577b40 into sonic-net:master Jun 14, 2019
oleksandrivantsiv pushed a commit to oleksandrivantsiv/sonic-swss that referenced this pull request Mar 1, 2023
Janetxxx pushed a commit to Janetxxx/sonic-swss that referenced this pull request Nov 10, 2025
* Write fields to FLEX_COUNTER_GROUP_TABLE at the construction of
a BufferOrch object:

"POLL_INTERVAL"
"BUFFER_POLL_PLUGIN_LIST"
"STATS_MODE"

Signed-off-by: Wenda Ni <wenni@microsoft.com>

* Update buffer pool name to oid mapping in COUNTERS_DB upon the set and del of its oid

Signed-off-by: Wenda Ni <wenni@microsoft.com>

* Push buffer pool watermark COUNTER_ID_LIST to FLEX_COUNTER_TABLE

Signed-off-by: Wenda Ni <wenni@microsoft.com>

* Implement user clear logic to buffer pool watermark

Signed-off-by: Wenda Ni <wenni@microsoft.com>

* Add periodic clear to buffer pool watermark

Signed-off-by: Wenda Ni <wenni@microsoft.com>

* Add lua script for watermark_bufferpool

Signed-off-by: Wenda Ni <wenni@microsoft.com>

* Fix syntax error in buffer pool watermark lua script

Signed-off-by: Wenda Ni <wenni@microsoft.com>

* Fix compile error in watermarkorch.cpp

Signed-off-by: Wenda Ni <wenni@microsoft.com>

* Fix from dut verification

Signed-off-by: Wenda Ni <wenni@microsoft.com>

* Add 6000 to read only polling mode

Signed-off-by: Wenda Ni <wenni@microsoft.com>

* Touch-up to existing codes

Signed-off-by: Wenda Ni <wenni@microsoft.com>

* Remove debugging symbols

Signed-off-by: Wenda Ni <wenni@microsoft.com>

* Address comments

Signed-off-by: Wenda Ni <wenni@microsoft.com>

* Address comments

Signed-off-by: Wenda Ni <wenni@microsoft.com>
jianyuewu pushed a commit to jianyuewu/sonic-swss that referenced this pull request Dec 24, 2025
…aces (sonic-net#853)

libswsscommon depends on libyang deb. libyang is deprecated in bookworm. This wouldn't be a problem for buildimage because libyang is compiled from source in buildimage.

However, this is causing a problem in upgrading one of our app-extensions to bookworm. This app-extension is built separately and not part of buildimage infra.

Thus provide a build flag to disable compilation of libyang dependent interfaces such as DecoratorTable etc. Please note, there is no change in the default behavior

vkarri@6c5cda5d64fa:/sonic/src/sonic-swss-common$ debuild -b -us -uc -Pnopython2,noyangmod
vkarri@6c5cda5d64fa:/sonic/src$ sudo dpkg -i libswsscommon_1.0.0_amd64.deb
vkarri@6c5cda5d64fa:/sonic/src$ sudo dpkg -i python3-swsscommon_1.0.0_amd64.deb
vkarri@6c5cda5d64fa:/sonic/src$ python3 -c "from swsscommon.swsscommon import DecoratorSubscriberStateTable, DecoratorTable, YangDefaultDecorator"
Traceback (most recent call last):
  File "<string>", line 1, in <module>
ImportError: cannot import name 'DecoratorSubscriberStateTable' from 'swsscommon.swsscommon' (/usr/lib/python3/dist-packages/swsscommon/swsscommon.py)
vkarri@6c5cda5d64fa:/sonic/src$ python3 -c "from swsscommon.swsscommon import DecoratorTable, YangDefaultDecorator"
Traceback (most recent call last):
  File "<string>", line 1, in <module>
ImportError: cannot import name 'DecoratorTable' from 'swsscommon.swsscommon' (/usr/lib/python3/dist-packages/swsscommon/swsscommon.py)
vkarri@6c5cda5d64fa:/sonic/src$ python3 -c "from swsscommon.swsscommon import YangDefaultDecorator"
Traceback (most recent call last):
  File "<string>", line 1, in <module>
ImportError: cannot import name 'YangDefaultDecorator' from 'swsscommon.swsscommon' (/usr/lib/python3/dist-packages/swsscommon/swsscommon.py)
vkarri@6c5cda5d64fa:/sonic/src$ python3 -c "from swsscommon.swsscommon import SubscriberStateTable, ProducerStateTable, Table, DBConnector"

<Default Behavior>
vkarri@6c5cda5d64fa:/sonic$ make -f slave.mk target/debs/bookworm/python3-swsscommon_1.0.0_amd64.deb-install
vkarri@6c5cda5d64fa:/sonic$ python3 -c "from swsscommon.swsscommon import DecoratorSubscriberStateTable, DecoratorTable, YangDefaultDecorator"
vkarri@6c5cda5d64fa:/sonic$

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
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.

4 participants