]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/MgrMap: dump mgr_features as an object property
authorKefu Chai <kchai@redhat.com>
Sun, 22 Sep 2019 12:43:49 +0000 (20:43 +0800)
committerKefu Chai <kchai@redhat.com>
Sun, 22 Sep 2019 12:44:28 +0000 (20:44 +0800)
it's a property of "standby" object, not an element of
"available_modules".

it's a follow-up fix of 351a3b9d

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/mon/MgrMap.h

index c3db247355618b7d66f3a64daeecf411d6cc56f1..ab82b2d63e4eaec5cd6f407173729d9bf3a73bf2 100644 (file)
@@ -457,11 +457,11 @@ public:
       f->open_object_section("standby");
       f->dump_int("gid", i.second.gid);
       f->dump_string("name", i.second.name);
+      f->dump_unsigned("mgr_features", i.second.mgr_features);
       f->open_array_section("available_modules");
       for (const auto& j : i.second.available_modules) {
         j.dump(f);
       }
-      f->dump_unsigned("mgr_features", i.second.mgr_features);
       f->close_section();
       f->close_section();
     }