From: Sage Weil <sage@newdream.net>
Date: Mon, 3 May 2021 16:04:28 +0000 (-0400)
Subject: mgr/cephadm: make 'host add' idempotent
X-Git-Tag: v16.2.5~51^2~3^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3c2e63482eb176d04ad17831221a0d520eb62733;p=ceph.git

mgr/cephadm: make 'host add' idempotent

Do not let prime_empty_host blow away inventory.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit a8acc354dc7dc1245f5030a751f4fc5ddb689b18)
---

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 08813a4653d..29373c9e8b8 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -1409,8 +1409,9 @@ Then run the following:
                 'args': [f'{k}={v}' for k, v in spec.location.items()],
             })
 
+        if spec.hostname not in self.inventory:
+            self.cache.prime_empty_host(spec.hostname)
         self.inventory.add_host(spec)
-        self.cache.prime_empty_host(spec.hostname)
         self.offline_hosts_remove(spec.hostname)
         self.event.set()  # refresh stray health check
         self.log.info('Added host %s' % spec.hostname)