From e38601ac2decf65bb19de410cf12d8b355584767 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Thu, 3 Jun 2021 14:40:21 +0200 Subject: [PATCH] ceph: always skip disks with filesystem MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Unless they are encrypted disk and have markers for a ceph cluster. Closes: https://github.com/rook/rook/issues/8046 Signed-off-by: Sébastien Han --- pkg/daemon/ceph/osd/daemon.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/daemon/ceph/osd/daemon.go b/pkg/daemon/ceph/osd/daemon.go index 2938d48e2..7fface098 100644 --- a/pkg/daemon/ceph/osd/daemon.go +++ b/pkg/daemon/ceph/osd/daemon.go @@ -309,10 +309,10 @@ func getAvailableDevices(context *clusterd.Context, agent *OsdAgent) (*DeviceOsd if device.Filesystem == "crypto_LUKS" && agent.pvcBacked { if isCephEncryptedBlock(context, agent.clusterInfo.FSID, device.Name) { logger.Infof("encrypted disk %q is an OSD part of this cluster, considering it", device.Name) - } else { - logger.Infof("skipping device %q because it contains a filesystem %q", device.Name, device.Filesystem) - continue } + } else { + logger.Infof("skipping device %q because it contains a filesystem %q", device.Name, device.Filesystem) + continue } }