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.

Sign up for GitHub

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

Jump to bottom

[202205] Fix issue: unconfigured PGs are displayed in watermarkstat #2568

Merged
merged 2 commits into from
Dec 26, 2022
Merged

[202205] Fix issue: unconfigured PGs are displayed in watermarkstat #2568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
243b9f4
Fix issue: unconfigured PGs are displayed in watermarkstat
stephenxs Dec 14, 2022
6fb180d
Same fix to pg-drop
stephenxs Dec 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions scripts/pg-drop
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,22 +117,25 @@ class PgDropStat(object):
self.header_list = ['Port']
header_map = pg_drop_type["obj_map"]

max_idx = 0
min_idx = sys.maxsize
header_idx_set = set()
for port in header_map.keys():
for element in header_map[port].keys():
element_idx = int(element.split(':')[1])
if element_idx > max_idx:
max_idx = element_idx
if min_idx > element_idx:
min_idx = element_idx
header_idx_set.add(element_idx)

if min_idx == sys.maxsize:
if len(header_idx_set) == 0:
print("Header info is not available!")
sys.exit(1)

self.min_idx = min_idx
self.header_list += ["{}{}".format(pg_drop_type["header_prefix"], idx) for idx in range(self.min_idx, max_idx + 1)]
header_idx_list = list(header_idx_set)
header_idx_list.sort()

self.header_idx_to_pos = {}
for i in header_idx_list:
self.header_idx_to_pos[i] = header_idx_list.index(i)

self.min_idx = header_idx_list[0]
self.header_list += ["{}{}".format(pg_drop_type["header_prefix"], idx) for idx in header_idx_list]

def get_counters(self, table_prefix, port_obj, idx_func, counter_name):
"""
Expand All @@ -150,7 +153,7 @@ class PgDropStat(object):
full_table_id = table_prefix + obj_id
old_collected_data = port_drop_ckpt.get(name,{})[full_table_id] if len(port_drop_ckpt) > 0 else 0
idx = int(idx_func(obj_id))
pos = idx - self.min_idx
pos = self.header_idx_to_pos[idx]
counter_data = self.counters_db.get(self.counters_db.COUNTERS_DB, full_table_id, counter_name)
if counter_data is None:
fields[pos] = STATUS_NA
Expand Down
23 changes: 13 additions & 10 deletions scripts/watermarkstat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,26 +217,29 @@ class Watermarkstat(object):
self.header_list = ['Port']
header_map = wm_type["obj_map"]

max_idx = 0
min_idx = sys.maxsize
header_idx_set = set()
for port in header_map.keys():
for element in header_map[port].keys():
element_idx = int(element.split(':')[1])
if element_idx > max_idx:
max_idx = element_idx
if min_idx > element_idx:
min_idx = element_idx
header_idx_set.add(element_idx)

if min_idx == sys.maxsize:
if len(header_idx_set) == 0:
if counter_type != 'q_shared_multi':
print("Object map is empty!", file=sys.stderr)
sys.exit(1)
else:
print("Object map from the COUNTERS_DB is empty because the multicast queues are not configured in the CONFIG_DB!")
sys.exit(0)

self.min_idx = min_idx
self.header_list += ["{}{}".format(wm_type["header_prefix"], idx) for idx in range(self.min_idx, max_idx + 1)]
header_idx_list = list(header_idx_set)
header_idx_list.sort()

self.header_idx_to_pos = {}
for i in header_idx_list:
self.header_idx_to_pos[i] = header_idx_list.index(i)

self.min_idx = header_idx_list[0]
self.header_list += ["{}{}".format(wm_type["header_prefix"], idx) for idx in header_idx_list]

def get_counters(self, table_prefix, port_obj, idx_func, watermark):
"""
Expand All @@ -249,7 +252,7 @@ class Watermarkstat(object):
for name, obj_id in port_obj.items():
full_table_id = table_prefix + obj_id
idx = int(idx_func(obj_id))
pos = idx - self.min_idx
pos = self.header_idx_to_pos[idx]
counter_data = self.counters_db.get(self.counters_db.COUNTERS_DB, full_table_id, watermark)
if counter_data is None or counter_data == '':
fields[pos] = STATUS_NA
Expand Down