From: Sage Weil <sage@inktank.com>
Date: Sat, 17 Aug 2013 06:33:06 +0000 (-0700)
Subject: osd: feed OSDMaps to the Objecter
X-Git-Tag: v0.69~27^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bc99437ef66982f99593660ae3c4606b488a59d2;p=ceph.git

osd: feed OSDMaps to the Objecter

Feed every map message we see (that isn't discarded for some other
reason) to the Objecter.  It has the same continuity requirements that
the OSD has, so it should be satisfied with what we get.  It can also
request maps via our MonClient.

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index a29b4e3efd6..cff0c8d6a52 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -5034,6 +5034,13 @@ void OSD::handle_osd_map(MOSDMap *m)
   if (session)
     session->put();
 
+  // share with the objecter
+  {
+    Mutex::Locker l(service.objecter_lock);
+    m->get();
+    service.objecter->handle_osd_map(m);
+  }
+
   epoch_t first = m->get_first();
   epoch_t last = m->get_last();
   dout(3) << "handle_osd_map epochs [" << first << "," << last << "], i have "