From 3f7ee9cbd335e4b8686688b79ec6110d73a7390e Mon Sep 17 00:00:00 2001 From: Alexander Sushko Date: Fri, 27 Nov 2020 14:04:13 +0300 Subject: [PATCH] pybind/mgr/prometheus/module.py: defaultdict for num_by_state num_by_state[state] += count in get_pg_status method raises KeyError if pg state is not in PG_STATES list. PG_STATES should be synced with osd_types.cc:pg_state_string(). But sometimes it is not. After the KeyError raise mgr metrics are not available at all. Fixes: https://tracker.ceph.com/issues/46142 Signed-off-by: Alexander Sushko --- src/pybind/mgr/prometheus/module.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pybind/mgr/prometheus/module.py b/src/pybind/mgr/prometheus/module.py index 71d451337d124..8e9b9317d9933 100644 --- a/src/pybind/mgr/prometheus/module.py +++ b/src/pybind/mgr/prometheus/module.py @@ -1,4 +1,5 @@ import cherrypy +from collections import defaultdict from distutils.version import StrictVersion import json import errno @@ -13,7 +14,7 @@ from mgr_util import get_default_addr, profile_method from rbd import RBD from collections import namedtuple try: - from typing import Optional, Dict, Any, Set + from typing import DefaultDict, Optional, Dict, Any, Set except ImportError: pass @@ -634,8 +635,7 @@ class Module(MgrModule): pg_summary = self.get('pg_summary') for pool in pg_summary['by_pool']: - num_by_state = dict((state, 0) for state in PG_STATES) - num_by_state['total'] = 0 + num_by_state = defaultdict(int) # type: DefaultDict[str, int] for state_name, count in pg_summary['by_pool'][pool].items(): for state in state_name.split('+'): -- 2.39.5