From: Adam King Date: Tue, 8 Apr 2025 17:42:46 +0000 (-0400) Subject: cephadm: check "ceph_device_lvm" field instead of "ceph_device" during zap X-Git-Tag: v20.3.0~58^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F62733%2Fhead;p=ceph.git cephadm: check "ceph_device_lvm" field instead of "ceph_device" during zap This field was renamed as part of https://github.com/ceph/ceph/commit/4941d098e337f2b7ad8c6f7c90be3ae252d22f7b but the cephadm piece was still looking for "ceph_device" meaning we would never zap any devices. Worth noting this won't get caught by teuthology as we make OSDs in that env directly on top of LVs made out of a split up nvme drive and ceph-volume inventory doesn't list LVs. Signed-off-by: Adam King --- diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py index b6e558e62ad0..c609dbb3c5c9 100755 --- a/src/cephadm/cephadm.py +++ b/src/cephadm/cephadm.py @@ -3936,7 +3936,7 @@ def _zap_osds(ctx: CephadmContext) -> None: raise Error(f'Invalid JSON in ceph-volume inventory: {e}') for i in ls: - matches = [lv.get('cluster_fsid') == ctx.fsid and i.get('ceph_device') for lv in i.get('lvs', [])] + matches = [lv.get('cluster_fsid') == ctx.fsid and i.get('ceph_device_lvm') for lv in i.get('lvs', [])] if any(matches) and all(matches): _zap(ctx, i.get('path')) elif any(matches):