matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[counter] Fix issue: non default counters will be delayed forever after fastboot (#10413)

Browse Source 
- Why I did it
Fastboot will delay all counters in CONFIG DB, it relies on enable_counters.py to recover the delayed counters. However, enable_counters.py does not recover those non-default counters.

- How I did it
For non-default counters, if it is in CONFIG DB, put delay status to false after the waiting.

- How to verify it
Manual test
This commit is contained in:
Junchao-Mellanox 2022-03-31 20:23:57 +08:00 committed by GitHub
parent 71a04722f4
commit 106fac5f09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dockers/docker-orchagent/enable_counters.py
View File

@ -38,16 +38,18 @@ def enable_rates():
def enable_counters(): def enable_counters():
db = swsssdk.ConfigDBConnector() db = swsssdk.ConfigDBConnector()
db.connect() db.connect()
enable_counter_group(db, 'PORT') default_enabled_counters = ['PORT', 'RIF', 'QUEUE', 'PFCWD', 'PG_WATERMARK', 'PG_DROP',
enable_counter_group(db, 'RIF') 'QUEUE_WATERMARK', 'BUFFER_POOL_WATERMARK', 'PORT_BUFFER_DROP', 'ACL']
enable_counter_group(db, 'QUEUE')
enable_counter_group(db, 'PFCWD') # Enable those default counters
enable_counter_group(db, 'PG_WATERMARK') for key in default_enabled_counters:
enable_counter_group(db, 'PG_DROP') enable_counter_group(db, key)
enable_counter_group(db, 'QUEUE_WATERMARK')
enable_counter_group(db, 'BUFFER_POOL_WATERMARK') # Set FLEX_COUNTER_DELAY_STATUS to false for those non-default counters
enable_counter_group(db, 'PORT_BUFFER_DROP') keys = db.get_keys('FLEX_COUNTER_TABLE')
enable_counter_group(db, 'ACL') for key in keys:
if key not in default_enabled_counters:
enable_counter_group(db, key)
enable_rates() enable_rates()