From: Sage Weil <sage@redhat.com>
Date: Tue, 31 Mar 2015 20:44:08 +0000 (-0700)
Subject: ceph-osd: fix usage
X-Git-Tag: v9.0.0~44^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0c293435488a916bb39185342dc450121769d7e0;p=ceph.git

ceph-osd: fix usage

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
index 884b7edcf444..a589ee7356d1 100644
--- a/src/ceph_osd.cc
+++ b/src/ceph_osd.cc
@@ -61,10 +61,19 @@ void handle_osd_signal(int signum)
 
 void usage() 
 {
-  derr << "usage: ceph-osd -i osdid [--osd-data=path] [--osd-journal=path] "
-       << "[--mkfs] [--mkjournal] [--convert-filestore]" << dendl;
-  derr << "   --debug_osd N   set debug level (e.g. 10)" << dendl;
+  cout << "usage: ceph-osd -i <osdid>\n"
+       << "  --osd-data=path   data directory\n"
+       << "  --osd-journal=path\n"
+       << "                    journal file or block device\n"
+       << "  --mkfs            create a [new] data directory\n"
+       << "  --convert-filestore\n"
+       << "                    run any pending upgrade operations\n"
+       << "  --flush-journal   flush all data out of journal\n"
+       << "  --mkjournal       initialize a new journal\n"
+       << "  --debug_osd N     set debug level (e.g. 10)"
+       << std::endl;
   generic_server_usage();
+  cout.flush();
 }
 
 int preload_erasure_code()