mgr: tolerate racing config-key change during load_store()

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

diff --git a/src/mgr/Mgr.cc b/src/mgr/Mgr.cc
index f8a2e2fba3402271e92b3fd86accb2979b75f93e..cc14eac3a0f21806cf5f66a0e1ce98a6e5b008ad 100644 (file)
--- a/src/mgr/Mgr.cc
+++ b/src/mgr/Mgr.cc
@@ -184,8 +184,9 @@ std::map<std::string, std::string> Mgr::load_store()
       lock.Unlock();
       get_cmd.wait();
       lock.Lock();
-      assert(get_cmd.r == 0);
-      loaded[key] = get_cmd.outbl.to_str();
+      if (get_cmd.r == 0) { // tolerate racing config-key change
+       loaded[key] = get_cmd.outbl.to_str();
+      }
     }
   }