]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: improve message when removing osd 47071/head
authorGuillaume Abrioux <gabrioux@redhat.com>
Fri, 17 Jun 2022 14:27:34 +0000 (16:27 +0200)
committerAdam King <adking@redhat.com>
Wed, 13 Jul 2022 00:44:11 +0000 (20:44 -0400)
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 <gabrioux@redhat.com>
(cherry picked from commit 854b62e2a9367e1ebe92c445b0bb419c185aad50)

src/pybind/mgr/cephadm/module.py

index d8cf7cee5c1744af0dc2dadd5a6ca6eb4b2dde5b..42200a7d04b09e2679bf0fceeafda3db24071551 100644 (file)
@@ -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: