From: Sage Weil <sage@redhat.com>
Date: Mon, 5 Jun 2017 20:15:43 +0000 (-0400)
Subject: mgr/Mgr: fix deadlock in load_config
X-Git-Tag: v12.1.0~213^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=30ae537a552096e9d3197d75af6b69731035c6f0;p=ceph.git

mgr/Mgr: fix deadlock in load_config

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mgr/Mgr.cc b/src/mgr/Mgr.cc
index ad1e96a2d582..ed523f53423a 100644
--- a/src/mgr/Mgr.cc
+++ b/src/mgr/Mgr.cc
@@ -348,9 +348,10 @@ void Mgr::load_config()
       std::ostringstream cmd_json;
       cmd_json << "{\"prefix\": \"config-key get\", \"key\": \"" << key << "\"}";
       get_cmd.run(monc, cmd_json.str());
+      lock.Unlock();
       get_cmd.wait();
+      lock.Lock();
       assert(get_cmd.r == 0);
-
       loaded[key] = get_cmd.outbl.to_str();
     }
   }