monc: fix race/deadlock for get_monmap_privately

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index df6d75bafb8c14416af8fc66b17dc14ede65ea94..180ac64bd9fee8d5c5d72bcd56f90667efd38fdd 100644 (file)
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -155,12 +155,14 @@ int MonClient::get_monmap_privately()
     utime_t interval(1, 0);
     map_cond.WaitInterval(monc_lock, interval);
   }
-  
+
   if (temp_msgr) {
+    monc_lock.Unlock();
     messenger->shutdown();
     rank->wait();
     messenger->destroy();
     messenger = 0;
+    monc_lock.Lock();
   }
  
   hunting = true;  // reset this to true!