From: Sage Weil <sage@redhat.com>
Date: Wed, 4 Mar 2020 17:47:01 +0000 (-0600)
Subject: mgr/cephadm: avoid racing updates to spec dict
X-Git-Tag: v15.1.1~118^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F33704%2Fhead;p=ceph.git

mgr/cephadm: avoid racing updates to spec dict

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

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 35b7fbaacd28..1c6ed178cae9 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -2185,7 +2185,10 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
 
     def _apply_all_services(self):
         r = False
+        specs = [] # type: List[orchestrator.ServiceSpec]
         for sn, spec in self.spec_store.specs.items():
+            specs.append(spec)
+        for spec in specs:
             try:
                 if self._apply_service(spec):
                     r = True