From 615a6562bc6ac78ca0f874c055cec4887363ba3e Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Tue, 5 Jun 2018 12:55:52 -0500
Subject: [PATCH] mgr: tolerate racing config-key change during load_store()

Signed-off-by: Sage Weil <sage@redhat.com>
---
 src/mgr/Mgr.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/mgr/Mgr.cc b/src/mgr/Mgr.cc
index f8a2e2fba34..cc14eac3a0f 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();
+      }
     }
   }
 
-- 
2.39.5