]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/DaemonServer: osd purge: accept --yes-i-really-mean-it too 22717/head
authorSage Weil <sage@redhat.com>
Mon, 30 Jul 2018 13:56:28 +0000 (08:56 -0500)
committerSage Weil <sage@redhat.com>
Wed, 1 Aug 2018 13:25:17 +0000 (08:25 -0500)
This avoids breaking old scripts.

Signed-off-by: Sage Weil <sage@redhat.com>
src/mgr/DaemonServer.cc

index 41c7dad8b741587af44bc63df1999fa0e384dffa..82f1ff7acf35e25afc8fb661c3e9b57bb67e1bfd 100644 (file)
@@ -1289,7 +1289,8 @@ bool DaemonServer::handle_command(MCommand *m)
              prefix == "osd purge")) {
       string sure;
       if (!cmd_getval(cct, cmdctx->cmdmap, "sure", sure) ||
-         sure != "--force") {
+         (sure != "--force" &&
+          sure != "--yes-i-really-mean-it" /* for backward compat */)) {
        ss << "\nYou can proceed by passing --force, but be warned that this will likely mean real, permanent data loss.";
       } else {
        r = 0;