From: Adam King <adking@redhat.com>
Date: Mon, 19 Jul 2021 16:19:15 +0000 (-0400)
Subject: mgr/cephadm: don't return hosts in offline_hosts set as schedulable
X-Git-Tag: v16.2.6~54^2~21
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a40d52334f905edb99be61a31f712c037b8e374c;p=ceph.git

mgr/cephadm: don't return hosts in offline_hosts set as schedulable

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)
---

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 54c65f361ee6..04ce846bb76e 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -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
             )
         ]