OSD: activate_map() in handle_osd_map only when active

Signed-off-by: Samuel Just <sam.just@inktank.com>

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index f47e9b8461cb4069c0f9e98a7a02bd22e043454f..a45b70076bbc81633f2ba122cb61d120f5948a85 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -3488,7 +3488,8 @@ void OSD::handle_osd_map(MOSDMap *m)
   map_lock.put_write();
 
   // yay!
-  activate_map();
+  if (is_active())
+    activate_map();
 
   if (m->newest_map && m->newest_map > last) {
     dout(10) << " msg say newest map is " << m->newest_map << ", requesting more" << dendl;