From 6f4ce388f4ab7d1e3d86ac75dedfed83ced02c26 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Fri, 17 Jun 2022 16:27:34 +0200 Subject: [PATCH] cephadm: improve message when removing osd make it clearer that not passing --zap will leave VG/LV, therefore all LVM metadata associated with the osd being removed from the Ceph cluster. Fixes: https://tracker.ceph.com/issues/56092 Signed-off-by: Guillaume Abrioux (cherry picked from commit 854b62e2a9367e1ebe92c445b0bb419c185aad50) --- src/pybind/mgr/cephadm/module.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py index d8cf7cee5c174..42200a7d04b09 100644 --- a/src/pybind/mgr/cephadm/module.py +++ b/src/pybind/mgr/cephadm/module.py @@ -2773,7 +2773,10 @@ Then run the following: # trigger the serve loop to initiate the removal self._kick_serve_loop() - return "Scheduled OSD(s) for removal" + warning_zap = "" if not zap else ("\nVG/LV for the OSDs won't be zapped (--zap wasn't passed).\n" + "Run the `ceph-volume lvm zap` command with `--destroy`" + " against the VG/LV if you want them to be destroyed.") + return f"Scheduled OSD(s) for removal.{warning_zap}" @handle_orch_error def stop_remove_osds(self, osd_ids: List[str]) -> str: -- 2.39.5