From dff4c69d52284b27ba37a584277357a8e298aa0b Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 5 Feb 2020 17:48:22 +0100 Subject: [PATCH] ceph-volume: skip osd creation when already done When rerunning ceph-volume lvm create on a device already prepared and activated, ceph-volume should skip the creation. This is a regression introduced by bb4de1a3fc238eaf9f717dc59c6bdf338ef6d657 Fixes: https://tracker.ceph.com/issues/43981 Signed-off-by: Guillaume Abrioux (cherry picked from commit 634a709b9c6802c5b12e2d45c2f43181b297adfb) --- src/ceph-volume/ceph_volume/devices/lvm/prepare.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/ceph-volume/ceph_volume/devices/lvm/prepare.py b/src/ceph-volume/ceph_volume/devices/lvm/prepare.py index d46308df44fb4..c602a705fb921 100644 --- a/src/ceph-volume/ceph_volume/devices/lvm/prepare.py +++ b/src/ceph-volume/ceph_volume/devices/lvm/prepare.py @@ -239,6 +239,9 @@ class Prepare(object): """ if args is not None: self.args = args + if api.is_ceph_device(self.get_lv(self.args.data)): + logger.info("device {} is already used".format(self.args.data)) + raise RuntimeError("skipping {}, it is already prepared".format(self.args.data)) try: self.prepare() except Exception: -- 2.39.5