From 37145dc154eba73fd054c2c2279932e392aa3f84 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Fri, 13 Nov 2009 10:40:02 -0800
Subject: [PATCH] monc: fix race/deadlock for get_monmap_privately

---
 src/mon/MonClient.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index df6d75bafb8c1..180ac64bd9fee 100644
--- 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!
-- 
2.39.5