]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
pybind/mgr/prometheus: don't crash when encountering an unknown PG state 18903/head
authorJan Fajerski <jfajerski@suse.com>
Mon, 13 Nov 2017 13:42:56 +0000 (14:42 +0100)
committerJan Fajerski <jfajerski@suse.com>
Mon, 13 Nov 2017 16:24:03 +0000 (17:24 +0100)
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
src/pybind/mgr/prometheus/module.py

index 842517f208f37e7a101864d875b295263caec083..80e8313d56ec889b0395eb5b402ef65cacab40b9 100644 (file)
@@ -263,7 +263,10 @@ class Module(MgrModule):
                          key.split('+')]
         for state, value in reported_pg_s:
             path = 'pg_{}'.format(state)
-            self.metrics[path].set(value)
+            try:
+                self.metrics[path].set(value)
+            except KeyError:
+                self.log.warn('Skipping unknown PG State {}'.format(state))
         reported_states = [s[0] for s in reported_pg_s]
         for state in PG_STATES:
             path = 'pg_{}'.format(state)