From: Sage Weil <sage@inktank.com>
Date: Fri, 5 Jul 2013 18:58:29 +0000 (-0700)
Subject: mon: sync all service prefixes, including pgmap_*
X-Git-Tag: v0.67-rc1~126^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ca54efd68ea324d0dc6bf806aa3f7d4a4beee286;p=ceph.git

mon: sync all service prefixes, including pgmap_*

This was just recently broken with the merge of the pgmap changes.

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index df09ff84799e..2e81a9da7360 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -742,7 +742,7 @@ set<string> Monitor::get_sync_targets_names() {
   set<string> targets;
   targets.insert(paxos->get_name());
   for (int i = 0; i < PAXOS_NUM; ++i)
-    targets.insert(paxos_service[i]->get_service_name());
+    paxos_service[i]->get_store_prefixes(targets);
 
   return targets;
 }
diff --git a/src/mon/PGMonitor.h b/src/mon/PGMonitor.h
index c6813eda3b13..3f8e579fd19d 100644
--- a/src/mon/PGMonitor.h
+++ b/src/mon/PGMonitor.h
@@ -150,6 +150,13 @@ public:
   { }
   ~PGMonitor() { }
 
+  virtual void get_store_prefixes(set<string>& s) {
+    s.insert(get_service_name());
+    s.insert("pgmap_meta");
+    s.insert("pgmap_pg");
+    s.insert("pgmap_osd");
+  }
+
   virtual void on_restart();
 
   /* Courtesy function provided by PaxosService, called when an election
diff --git a/src/mon/PaxosService.h b/src/mon/PaxosService.h
index 3e5c69fb22fe..57a5139b16c1 100644
--- a/src/mon/PaxosService.h
+++ b/src/mon/PaxosService.h
@@ -217,6 +217,13 @@ public:
    * @returns The service's name.
    */
   string get_service_name() { return service_name; }
+
+  /**
+   * Get the store prefixes we utilize
+   */
+  virtual void get_store_prefixes(set<string>& s) {
+    s.insert(service_name);
+  }
   
   // i implement and you ignore
   /**