]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
OSD::send_incremental_map: use service superblock so we can avoid locking osd_lock
authorSamuel Just <sam.just@inktank.com>
Fri, 8 Nov 2013 22:11:59 +0000 (14:11 -0800)
committerGreg Farnum <greg@inktank.com>
Mon, 5 May 2014 22:29:17 +0000 (15:29 -0700)
TODO: make it actually safe by dealing with build_incremental_map_msg()

Signed-off-by: Samuel Just <sam.just@inktank.com>
src/osd/OSD.cc

index 760ba073b53e9b41ae1797a98cdbaebfec8ea9c2..301d0eb353dbdc33df82546bc160fbc32aece7ea 100644 (file)
@@ -6021,6 +6021,7 @@ void OSD::send_incremental_map(epoch_t since, Connection *con)
   dout(10) << "send_incremental_map " << since << " -> " << to
            << " to " << con << " " << con->get_peer_addr() << dendl;
 
+  OSDSuperblock superblock(service.get_superblock());
   if (since < superblock.oldest_map) {
     // just send latest full map
     MOSDMap *m = new MOSDMap(monc->get_fsid());