From f75a6e9d930eb4c8c8fccfee1113c253a585e3cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Thu, 6 Aug 2020 17:20:52 +0200 Subject: [PATCH] ceph: do not list on empty device MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If the device is empty let's not use an empty space as an argument for the c-v call. Signed-off-by: Sébastien Han --- pkg/daemon/ceph/osd/volume.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkg/daemon/ceph/osd/volume.go b/pkg/daemon/ceph/osd/volume.go index 96aeefc09..f1c537a87 100644 --- a/pkg/daemon/ceph/osd/volume.go +++ b/pkg/daemon/ceph/osd/volume.go @@ -722,7 +722,12 @@ func GetCephVolumeRawOSDs(context *clusterd.Context, clusterInfo *client.Cluster // lv can be a block device if raw mode is used cvMode := "raw" - result, err := callCephVolume(context, cvMode, "list", block, "--format", "json") + args := []string{cvMode, "list", block, "--format", "json"} + if block == "" { + args = []string{cvMode, "list", "--format", "json"} + } + + result, err := callCephVolume(context, args...) if err != nil { return nil, errors.Wrapf(err, "failed to retrieve ceph-volume %s list results", cvMode) }