From ce037a6cde6204770649353167d84b0982334b74 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 (cherry picked from commit 3f7ee9cbd335e4b8686688b79ec6110d73a7390e) Conflicts: src/pybind/mgr/prometheus/module.py - Resolved import conflict --- src/pybind/mgr/prometheus/module.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pybind/mgr/prometheus/module.py b/src/pybind/mgr/prometheus/module.py index 390828b07bb31..cf9eb67b60c43 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 @@ -12,8 +13,8 @@ from mgr_module import MgrModule, MgrStandbyModule, CommandResult, PG_STATES from mgr_util import get_default_addr, profile_method from rbd import RBD try: - from typing import Optional, Dict, Any, Set -except: + from typing import DefaultDict, Optional, Dict, Any, Set +except ImportError: pass # Defaults for the Prometheus HTTP server. Can also set in config-key @@ -571,8 +572,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