Skip to content

Commit

Permalink
mgr/cephadm: don't redeploy osds seen in raw list if cephadm knows them
Browse files Browse the repository at this point in the history
As is already done when checking the lvm list
results and should also be done for checking raw
list but is missing do ot a backporting mistake

Tachnically a partial backport of ceph#44228 that
was not included in ceph#44627 because raw osd support
was not in pacific then

Signed-off-by: Adam King <adking@redhat.com>
  • Loading branch information
adk3798 committed Jun 6, 2022
1 parent 6229fc9 commit 9f4800a
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/pybind/mgr/cephadm/services/osd.py
Expand Up @@ -162,6 +162,10 @@ def deploy_osd_daemons_for_existing_osds(self, host: str, service_name: str,
if osd_id in before_osd_uuid_map and osd_id not in replace_osd_ids:
# if it exists but is part of the replacement operation, don't skip
continue
if self.mgr.cache.has_daemon(f'osd.{osd_id}', host):
# cephadm daemon instance already exists
logger.debug(f'osd id {osd_id} daemon already exists')
continue
if osd_id not in osd_uuid_map:
logger.debug('osd id {} does not exist in cluster'.format(osd_id))
continue
Expand Down

0 comments on commit 9f4800a

Please sign in to comment.