ceph.in: print help on 'osd' or 'mon'

Fixes: #10888
Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index f47f1d8efbf39c83d0d81944474e7cf28d08b1d8..e7a8220c3597291de689c6d82a4a6ad2a33aab63 100755 (executable)
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -832,6 +832,8 @@ function test_mon_mds()
 
 function test_mon_mon()
 {
+  # print help message
+  ceph mon
   # no mon add/remove
   ceph mon dump
   ceph mon getmap -o $TMPDIR/monmap.$$
@@ -954,6 +956,7 @@ function test_mon_osd()
   [ "$id" = "$id2" ]
   ceph osd rm $id
 
+  ceph osd
   ceph osd ls
   ceph osd pool create data 10
   ceph osd lspools | grep data

diff --git a/src/ceph.in b/src/ceph.in
index 53f808733373f85d99e9caeab1556185d0442634..b8ca53c6e56e88ceb893425a87212244b7df2c5d 100755 (executable)
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -666,6 +666,9 @@ def main():
         print >> sys.stderr, '"{0} tell" is deprecated; try "tell {0}.<id>" instead (id can be "*") '.format(childargs[0])
         return 1
 
+    if childargs in [['mon'], ['osd']]:
+        parsed_args.help = True
+
     if parsed_args.help:
         # short default timeout for -h
         if not timeout: