From: Joshua Schmid Date: Fri, 18 Sep 2020 08:55:17 +0000 (+0200) Subject: Merge pull request #37135 from sebastian-philipp/cephadm-race-add-host-vs-apply X-Git-Tag: v16.1.0~1060 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e87a408995df965d76a6824aabb50ce507eaca9f;p=ceph.git Merge pull request #37135 from sebastian-philipp/cephadm-race-add-host-vs-apply mgr/cephadm: Fix race between host_add and _apply_all_specs --- e87a408995df965d76a6824aabb50ce507eaca9f diff --cc src/pybind/mgr/cephadm/module.py index 0632f1e68efe,fc725bb53702..8becef0b332a --- a/src/pybind/mgr/cephadm/module.py +++ b/src/pybind/mgr/cephadm/module.py @@@ -2387,11 -2365,9 +2400,9 @@@ To check that the host is reachable @trivial_completion def add_mgr(self, spec): # type: (ServiceSpec) -> List[str] - return self._add_daemon('mgr', spec, self.mgr_service.create) + return self._add_daemon('mgr', spec, self.mgr_service.prepare_create) def _apply(self, spec: GenericSpec) -> str: - self.migration.verify_no_migration() - if spec.service_type == 'host': return self._add_host(cast(HostSpec, spec))