From: xie xingguo Date: Mon, 10 Jul 2017 07:22:32 +0000 (+0800) Subject: mon/OSDMonitor: allow user to permanently delete pool X-Git-Tag: v12.1.1~81^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2ce818ae88174492584d7929509574ad583d2bdc;p=ceph.git mon/OSDMonitor: allow user to permanently delete pool If mon_fake_pool_delete is enabled, "osd pool delete" will unable to delete pool permanently, as we ask user to pass in a "--yes-i-really-really-mean-it-no-faking" string now. The old "osd pool delete" command won't allow user to do this. Signed-off-by: xie xingguo --- diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h index 679166864749..8d974660f29d 100644 --- a/src/mon/MonCommands.h +++ b/src/mon/MonCommands.h @@ -850,7 +850,7 @@ COMMAND("osd pool create " \ COMMAND("osd pool delete " \ "name=pool,type=CephPoolname " \ "name=pool2,type=CephPoolname,req=false " \ - "name=sure,type=CephChoices,strings=--yes-i-really-really-mean-it,req=false", \ + "name=sure,type=CephString,req=false", \ "delete pool", \ "osd", "rw", "cli,rest") COMMAND("osd pool rm " \ diff --git a/src/test/pybind/test_ceph_argparse.py b/src/test/pybind/test_ceph_argparse.py index 882487cc678f..7220c91c6a2d 100755 --- a/src/test/pybind/test_ceph_argparse.py +++ b/src/test/pybind/test_ceph_argparse.py @@ -1015,9 +1015,6 @@ class TestOSD(TestArgparse): self.assert_valid_command(['osd', 'pool', 'delete', 'poolname']) assert_equal({}, validate_command(sigdict, ['osd', 'pool', 'delete'])) - assert_equal({}, validate_command(sigdict, ['osd', 'pool', 'delete', - 'poolname', 'poolname', - 'not really'])) assert_equal({}, validate_command(sigdict, ['osd', 'pool', 'delete', 'poolname', 'poolname',