From: Laura Flores <lflores@redhat.com>
Date: Wed, 2 Feb 2022 23:57:23 +0000 (+0000)
Subject: mgr/telemetry: compare len(values) to len(categories)
X-Git-Tag: v17.1.0~12^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F45029%2Fhead;p=ceph.git

mgr/telemetry: compare len(values) to len(categories)

This format will allow us to safely add or remove
categories as needed in the future.

Signed-off-by: Laura Flores <lflores@redhat.com>
(cherry picked from commit 5ac1dd6866287d9e5bc895a4028836d09c836069)
---

diff --git a/src/pybind/mgr/telemetry/module.py b/src/pybind/mgr/telemetry/module.py
index 8ed73ffe5f61..b107e3b8e32c 100644
--- a/src/pybind/mgr/telemetry/module.py
+++ b/src/pybind/mgr/telemetry/module.py
@@ -427,7 +427,7 @@ class Module(MgrModule):
                                   'spans_in_use',
                                   'thread_heaps_in_use',
                                   'tcmalloc_page_size']
-                    if len(values) != 12:
+                    if len(values) != len(categories):
                         self.log.debug('Received unexpected output from osd.{}; number of values should match the number of expected categories:\n' \
                                 'values: len={} {} ~ categories: len={} {} ~ outs: {}'.format(osd_id, len(values), values, len(categories), categories, outs))
                         continue