]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr: add mon metada using type of "mon" 40359/head
authorKefu Chai <kchai@redhat.com>
Tue, 9 Mar 2021 04:51:55 +0000 (12:51 +0800)
committerKefu Chai <kchai@redhat.com>
Wed, 24 Mar 2021 07:27:31 +0000 (15:27 +0800)
this change addresses a regression introduced by
c037f4cb5d7436879d58c34748ef516b5269781f

also remove the "P" before the json command.

see also: https://tracker.ceph.com/issues/48905

Fixes: https://tracker.ceph.com/issues/49661
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 8fc290bfba4d71a60d30c2374ce4bcba37e649de)

 Conflicts:
src/mgr/Mgr.cc: trivial resolution

src/mgr/Mgr.cc

index 5dee63267ea9f563adbb6d16b1906aede353872f..941f146cd27cbbfdf63e6209205001272ce68464 100644 (file)
@@ -510,7 +510,7 @@ void Mgr::handle_mon_map()
     }
   });
   for (const auto& name : names_exist) {
-    const auto k = DaemonKey{"osd", name};
+    const auto k = DaemonKey{"mon", name};
     if (daemon_state.is_updating(k)) {
       continue;
     }