From: huanwen ren <ren.huanwen@zte.com.cn>
Date: Mon, 25 Sep 2017 07:01:02 +0000 (+0800)
Subject: mon/mgr: sync mgr_command_descs table and mgr_metadata table
X-Git-Tag: ses5-deepsea-pr-test~8^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3e2d67c1060f7c602caa804d7c346017321f3504;p=ceph.git

mon/mgr: sync mgr_command_descs table and mgr_metadata table

sync mgr_command_descs table and mgr_metadata table to new mons

Fixes: http://tracker.ceph.com/issues/21527

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
(cherry picked from commit 13f6aa3aaa6de0aeccec67d7c6f3effe43dcae49)

Conflict: in master PaxosService::get_store_prefixes(..) is marked const
while in luminous, the cleanup commit which added the `const` is not
backported yet, so drop the `const` in the backported commit.

(cherry picked from commit 338af1688147babb4e92523972175fe09ebb34b6)
Signed-off-by: Joao Eduardo Luis <joao@suse.de>
(cherry picked from commit 6c84a3317b17e1055211cf59956783668a13f044)
---

diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc
index 3840b642b956..59d4d635732e 100644
--- a/src/mon/MgrMonitor.cc
+++ b/src/mon/MgrMonitor.cc
@@ -53,6 +53,13 @@ void MgrMonitor::create_initial()
 	   << dendl;
 }
 
+void MgrMonitor::get_store_prefixes(std::set<string>& s)
+{
+  s.insert(service_name);
+  s.insert(command_descs_prefix);
+  s.insert(MGR_METADATA_PREFIX);
+}
+
 void MgrMonitor::update_from_paxos(bool *need_bootstrap)
 {
   version_t version = get_last_committed();
diff --git a/src/mon/MgrMonitor.h b/src/mon/MgrMonitor.h
index 563ae7c5de8d..f7fb506cd1bc 100644
--- a/src/mon/MgrMonitor.h
+++ b/src/mon/MgrMonitor.h
@@ -79,6 +79,7 @@ public:
   bool in_use() const { return map.epoch > 0; }
 
   void create_initial() override;
+  void get_store_prefixes(std::set<string>& s) override;
   void update_from_paxos(bool *need_bootstrap) override;
   void create_pending() override;
   void encode_pending(MonitorDBStore::TransactionRef t) override;