librados: call objecter->handle_osd_map() under lock

The lock is not shared with the objecter anymore so we need to call
it under this lock, otherwise we're going to race with
wait_for_osdmap().

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>

diff --git a/src/librados/RadosClient.cc b/src/librados/RadosClient.cc
index 10f2679b3be1e7ea047852800ff5204e0b9c1f7d..6c0c2b8406d19c658f1cb0c01299232086abfdb5 100644 (file)
--- a/src/librados/RadosClient.cc
+++ b/src/librados/RadosClient.cc
@@ -384,8 +384,8 @@ bool librados::RadosClient::_dispatch(Message *m)
     objecter->handle_osd_op_reply(static_cast<MOSDOpReply*>(m));
     break;
   case CEPH_MSG_OSD_MAP:
-    objecter->handle_osd_map(static_cast<MOSDMap*>(m));
     lock.Lock();
+    objecter->handle_osd_map(static_cast<MOSDMap*>(m));
     pool_cache_rwl.get_write();
     osdmap_epoch = osdmap.get_epoch();
     pool_cache_rwl.unlock();