diff options
| -rw-r--r-- | doc/man/8/rados.rst | 2 | ||||
| -rw-r--r-- | doc/rados/operations/control.rst | 4 | ||||
| -rw-r--r-- | doc/rados/operations/pools.rst | 2 | ||||
| -rw-r--r-- | man/rados.8 | 2 | ||||
| -rw-r--r-- | src/rados.cc | 5 | ||||
| -rw-r--r-- | src/test/cli/ceph/help.t | 2 | ||||
| -rw-r--r-- | src/tools/ceph.cc | 2 |
7 files changed, 10 insertions, 9 deletions
diff --git a/doc/man/8/rados.rst b/doc/man/8/rados.rst index f6fde9b91a6..e12f2da646a 100644 --- a/doc/man/8/rados.rst +++ b/doc/man/8/rados.rst @@ -65,7 +65,7 @@ Global commands :command:`mkpool` *foo* Create a pool with name foo. -:command:`rmpool` *foo* +:command:`rmpool` *foo* [ *foo* --yes-i-really-really-mean-it ] Delete the pool foo (and all its data) diff --git a/doc/rados/operations/control.rst b/doc/rados/operations/control.rst index db5b8008675..e956c4d9334 100644 --- a/doc/rados/operations/control.rst +++ b/doc/rados/operations/control.rst @@ -237,8 +237,8 @@ Creates/deletes a snapshot of a pool. :: Creates/deletes/renames a storage pool. :: ceph osd pool create {pool-name} pg_num [pgp_num] - ceph osd pool delete {pool-name} - ceph osd pool rename {old-name} {new-name} + ceph osd pool delete {pool-name} [{pool-name} --yes-i-really-really-mean-it] + ceph osd pool rename {old-name} {new-name} Changes a pool setting. :: diff --git a/doc/rados/operations/pools.rst b/doc/rados/operations/pools.rst index a13fa91bcd8..3b492f3862e 100644 --- a/doc/rados/operations/pools.rst +++ b/doc/rados/operations/pools.rst @@ -106,7 +106,7 @@ Delete a Pool To delete a pool, execute:: - ceph osd pool delete {pool-name} + ceph osd pool delete {pool-name} [{pool-name} --yes-i-really-really-mean-it] If you created your own rulesets and rules for a pool you created, you should diff --git a/man/rados.8 b/man/rados.8 index 046ffbf433d..ef65f651e98 100644 --- a/man/rados.8 +++ b/man/rados.8 @@ -90,7 +90,7 @@ counts, over the entire system and broken down by pool. .B \fBmkpool\fP \fIfoo\fP Create a pool with name foo. .TP -.B \fBrmpool\fP \fIfoo\fP +.B \fBrmpool\fP \fIfoo\fP [ \flfoo\fP \-\-yes\-i\-really\-really\-mean\-it ] Delete the pool foo (and all its data) .UNINDENT .SH POOL SPECIFIC COMMANDS diff --git a/src/rados.cc b/src/rados.cc index 0b012c5972b..a850f874ac2 100644 --- a/src/rados.cc +++ b/src/rados.cc @@ -58,7 +58,8 @@ void usage(ostream& out) " mkpool <pool-name> [123[ 4]] create pool <pool-name>'\n" " [with auid 123[and using crush rule 4]]\n" " cppool <pool-name> <dest-pool> copy content of a pool\n" -" rmpool <pool-name> remove pool <pool-name>'\n" +" rmpool <pool-name> [<pool-name> --yes-i-really-really-mean-it]\n" +" remove pool <pool-name>'\n" " df show per-pool and total usage\n" " ls list objects in pool\n\n" " chown 123 change the pool owner to auid 123\n" @@ -1799,7 +1800,7 @@ static int rados_tool_common(const std::map < std::string, std::string > &opts, strcmp(nargs[1], nargs[2]) != 0 || strcmp(nargs[3], "--yes-i-really-really-mean-it") != 0) { cerr << "WARNING:\n" - << " This will PERMANENTLY DESTROY an entire pool of object with no way back.\n" + << " This will PERMANENTLY DESTROY an entire pool of objects with no way back.\n" << " To confirm, pass the pool to remove twice, followed by\n" << " --yes-i-really-really-mean-it" << std::endl; cout << nargs << std::endl; diff --git a/src/test/cli/ceph/help.t b/src/test/cli/ceph/help.t index e8afdaf7d35..186490aebd4 100644 --- a/src/test/cli/ceph/help.t +++ b/src/test/cli/ceph/help.t @@ -56,7 +56,7 @@ ceph osd pool mksnap <pool> <snapname> ceph osd pool rmsnap <pool> <snapname> ceph osd pool create <pool> <pg_num> [<pgp_num>] - ceph osd pool delete <pool> + ceph osd pool delete <pool> [<pool> --yes-i-really-really-mean-it] ceph osd pool rename <pool> <new pool name> ceph osd pool set <pool> <field> <value> ceph osd scrub <osd-id> diff --git a/src/tools/ceph.cc b/src/tools/ceph.cc index 7582ac96ab2..c99d8624978 100644 --- a/src/tools/ceph.cc +++ b/src/tools/ceph.cc @@ -99,7 +99,7 @@ static void usage() cout << " ceph osd pool mksnap <pool> <snapname>\n"; cout << " ceph osd pool rmsnap <pool> <snapname>\n"; cout << " ceph osd pool create <pool> <pg_num> [<pgp_num>]\n"; - cout << " ceph osd pool delete <pool>\n"; + cout << " ceph osd pool delete <pool> [<pool> --yes-i-really-really-mean-it]\n"; cout << " ceph osd pool rename <pool> <new pool name>\n"; cout << " ceph osd pool set <pool> <field> <value>\n"; cout << " ceph osd scrub <osd-id>\n"; |