]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr: Add missing states to PG_STATES in mgr_module.py. 36785/head
authorHarley Gorrell <harley@panix.com>
Fri, 31 Jul 2020 23:21:47 +0000 (17:21 -0600)
committerLaura Paduano <lpaduano@suse.com>
Fri, 28 Aug 2020 10:20:43 +0000 (12:20 +0200)
Fixes: https://tracker.ceph.com/issues/46808
Signed-off-by: Harley Gorrell <harley@panix.com>
(cherry picked from commit 5cdadf17d634e1cbd8d2b0be8c9439bc20bdbd13)

Conflicts:
src/pybind/mgr/mgr_module.py
- state "laggy" and "wait" are not relevant for nautilus

src/pybind/mgr/mgr_module.py

index 9b614d367519c9b001caac3acd75a843967b793d..ebec969eb432b3c1f97f0791b33e724a24c66e94 100644 (file)
@@ -14,6 +14,7 @@ import rados
 import re
 import time
 
+# Full list of strings in "osd_types.cc:pg_state_string()"
 PG_STATES = [
     "active",
     "clean",
@@ -44,7 +45,10 @@ PG_STATES = [
     "snaptrim_wait",
     "snaptrim_error",
     "creating",
-    "unknown"]
+    "unknown",
+    "premerge",
+    "failed_repair",
+]
 
 
 class CPlusPlusHandler(logging.Handler):