Skip to content

Commit a66fa34

Browse files
Junchao-Mellanoxpull[bot]
authored andcommitted
[counter] Fix issue: non default counters will be delayed forever after fastboot (#10413)
- 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
1 parent 4125999 commit a66fa34

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

dockers/docker-orchagent/enable_counters.py

+12-10
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,18 @@ def enable_rates():
3838
def enable_counters():
3939
db = swsssdk.ConfigDBConnector()
4040
db.connect()
41-
enable_counter_group(db, 'PORT')
42-
enable_counter_group(db, 'RIF')
43-
enable_counter_group(db, 'QUEUE')
44-
enable_counter_group(db, 'PFCWD')
45-
enable_counter_group(db, 'PG_WATERMARK')
46-
enable_counter_group(db, 'PG_DROP')
47-
enable_counter_group(db, 'QUEUE_WATERMARK')
48-
enable_counter_group(db, 'BUFFER_POOL_WATERMARK')
49-
enable_counter_group(db, 'PORT_BUFFER_DROP')
50-
enable_counter_group(db, 'ACL')
41+
default_enabled_counters = ['PORT', 'RIF', 'QUEUE', 'PFCWD', 'PG_WATERMARK', 'PG_DROP',
42+
'QUEUE_WATERMARK', 'BUFFER_POOL_WATERMARK', 'PORT_BUFFER_DROP', 'ACL']
43+
44+
# Enable those default counters
45+
for key in default_enabled_counters:
46+
enable_counter_group(db, key)
47+
48+
# Set FLEX_COUNTER_DELAY_STATUS to false for those non-default counters
49+
keys = db.get_keys('FLEX_COUNTER_TABLE')
50+
for key in keys:
51+
if key not in default_enabled_counters:
52+
enable_counter_group(db, key)
5153
enable_rates()
5254

5355

0 commit comments

Comments
 (0)