From: Sage Weil <sage@redhat.com>
Date: Tue, 5 Jun 2018 17:55:52 +0000 (-0500)
Subject: mgr: tolerate racing config-key change during load_store()
X-Git-Tag: v14.0.1~1131^2~16
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=615a6562bc6ac78ca0f874c055cec4887363ba3e;p=ceph.git

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 f8a2e2fba340..cc14eac3a0f2 100644
--- 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();
+      }
     }
   }