]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: don't return hosts in offline_hosts set as schedulable
authorAdam King <adking@redhat.com>
Mon, 19 Jul 2021 16:19:15 +0000 (12:19 -0400)
committerSebastian Wagner <sewagner@redhat.com>
Tue, 10 Aug 2021 14:32:17 +0000 (16:32 +0200)
we are only checking for host status here but we
should also be checking the offline_hosts set

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit d87f1ec841f63a9d7bd52e03461b04d8c6273a94)

src/pybind/mgr/cephadm/module.py

index 54c65f361ee6649fe441038e3e387b804fe71618..04ce846bb76e491bee14b8db7fbe45246389da86 100644 (file)
@@ -1391,6 +1391,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule,
             if (
                 self.cache.host_had_daemon_refresh(h.hostname)
                 and h.status.lower() not in ['maintenance', 'offline']
+                and h.hostname not in self.offline_hosts
                 and '_no_schedule' not in h.labels
             )
         ]