doc: improve ceph-mon usage, fix ceph tell examples

The ceph-mon command usage is updated to document all of the ceph-mon
specific options.

The ceph tell usage examples for log and debug are using a deprecated syntax.

Signed-off-by: Loic Dachary <loic@dachary.org>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

diff --git a/doc/dev/mon-bootstrap.rst b/doc/dev/mon-bootstrap.rst
index 0a4a9a2981e8250a28c24c3178e0c1835dd93a96..3c0a3ddc96c1751274ac3b812ceaf9ef95a091a9 100644 (file)
--- a/doc/dev/mon-bootstrap.rst
+++ b/doc/dev/mon-bootstrap.rst
@@ -63,7 +63,7 @@ The monitor address can be provided in several ways.
 #. via the ``--public-addr <ip[:port]>`` command-line option (or config file option)
 #. via the ``--public-network <cidr>`` command-line option (or config file option)
 #. via the monmap provided via ``--monmap <path>``, if it includes a monitor with our name
-#. via the bootstrap monmap (provided via ``--monmap <path>`` or generated from ``--mon-host <list>``) if it includes a monitor with no name (``noname-<something>``) and an address configured on the local host.
+#. via the bootstrap monmap (provided via ``--inject-monmap <path>`` or generated from ``--mon-host <list>``) if it includes a monitor with no name (``noname-<something>``) and an address configured on the local host.
 
 Peers
 =====

diff --git a/doc/rados/troubleshooting/log-and-debug.rst b/doc/rados/troubleshooting/log-and-debug.rst
index 7d1ea43d1dba4448d2844324a3a2fa34b8fa6d14..cfd3e6d32f8cd7a32faeec8d9bbb34fb71080f9f 100644 (file)
--- a/doc/rados/troubleshooting/log-and-debug.rst
+++ b/doc/rados/troubleshooting/log-and-debug.rst
@@ -40,14 +40,14 @@ in to a host with a running daemon and execute the following::
 To activate Ceph's debugging output (*i.e.*, ``dout()``) at runtime,  use the
 ``ceph tell`` command to inject arguments into the runtime configuration:: 
 
-       ceph {daemon-type} tell {daemon id or *} injectargs '--{name} {value} [--{name} {value}]'
+       ceph tell {daemon-type}.{daemon id or *} injectargs '--{name} {value} [--{name} {value}]'
        
 Replace ``{daemon-type}`` with one of ``osd``, ``mon`` or ``mds``. You may apply
 the runtime setting to all daemons of a particular type with ``*``, or specify
 a specific daemon's ID (i.e., its number or letter). For example, to increase
 debug logging for a ``ceph-osd`` daemon named ``osd.0``, execute the following:: 
 
-       ceph osd tell 0 injectargs '--debug_osd 0/5'
+       ceph tell osd.0 injectargs '--debug-osd 0/5'
 
 The ``ceph tell`` command goes through the monitors. If you cannot bind to the
 monitor, you can still make the change by logging into the host of the daemon

diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc
index 2fc9e91124de518f533fba062a291e200a8ccab9..e4e402991199fc5ddf1e1bfaa2c36806b5f68e82 100644 (file)
--- a/src/ceph_mon.cc
+++ b/src/ceph_mon.cc
@@ -103,13 +103,25 @@ int obtain_monmap(MonitorDBStore &store, bufferlist &bl)
 
 void usage()
 {
-  cerr << "usage: ceph-mon -i monid [--mon-data=pathtodata] [flags]" << std::endl;
+  cerr << "usage: ceph-mon -i monid [flags]" << std::endl;
   cerr << "  --debug_mon n\n";
   cerr << "        debug monitor level (e.g. 10)\n";
   cerr << "  --mkfs\n";
   cerr << "        build fresh monitor fs\n";
   cerr << "  --force-sync\n";
   cerr << "        force a sync from another mon by wiping local data (BE CAREFUL)\n";
+  cerr << "  --yes-i-really-mean-it\n";
+  cerr << "        mandatory safeguard for --force-sync\n";
+  cerr << "  --compact\n";
+  cerr << "        compact the monitor store\n";
+  cerr << "  --osdmap <filename>\n";
+  cerr << "        only used when --mkfs is provided: load the osdmap from <filename>\n";
+  cerr << "  --inject-monmap <filename>\n";
+  cerr << "        write the <filename> monmap to the local monitor store and exit\n";
+  cerr << "  --extract-monmap <filename>\n";
+  cerr << "        extract the monmap from the local monitor store and exit\n";
+  cerr << "  --mon-data <directory>\n";
+  cerr << "        where the mon store and keyring are located\n";
   generic_server_usage();
 }