Documentation Fixes for http://tracker.ceph.com/issues/19879

and related bug http://tracker.ceph.com/issues/20057

Signed-off-by: Sameer Tiwari <stiwari@salesforce.com>

diff --git a/doc/man/8/ceph-osd.rst b/doc/man/8/ceph-osd.rst
index e8b2805b14e7fede76274f97736d7f6c2a28b063..6c484c386cefb24e7e77303110cb703fdf30a36c 100644 (file)
--- a/doc/man/8/ceph-osd.rst
+++ b/doc/man/8/ceph-osd.rst
@@ -10,7 +10,7 @@ Synopsis
 ========
 
 | **ceph-osd** -i *osdnum* [ --osd-data *datapath* ] [ --osd-journal
-  *journal* ] [ --mkfs ] [ --mkjournal ] [ --mkkey ]
+  *journal* ] [ --mkfs ] [ --mkjournal ] [--flush-journal] [--check-allows-journal] [--check-wants-journal] [--check-needs-journal] [ --mkkey ]
 
 
 Description
@@ -57,6 +57,18 @@ Options
 
    Journal updates to *journal*.
 
+.. option:: --check-allows-journal
+
+   Check whether a journal is desired.
+
+.. option:: --check-wants-journal
+
+   Check whether a journal is allowed.
+
+.. option:: --check-needs-journal
+
+   Check whether a journal is required.
+
 .. option:: --mkfs
 
    Create an empty object repository. This also initializes the journal

diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
index 5135c81ed9407042efcd274af3d057a8c4775cb4..a27ffb8548ff095b5383c4d58a57b93d48f1d91c 100644 (file)
--- a/src/ceph_osd.cc
+++ b/src/ceph_osd.cc
@@ -78,6 +78,7 @@ static void usage()
        << "  --osd-journal PATH\n"
        << "                    journal file or block device\n"
        << "  --mkfs            create a [new] data directory\n"
+       << "  --mkkey           generate a new secret key. This is normally used in combination with --mkfs\n"
        << "  --convert-filestore\n"
        << "                    run any pending upgrade operations\n"
        << "  --flush-journal   flush all data out of journal\n"