cephtool: mention ceph osd ls, fix ceph osd tell N bench

Add ceph osd ls to help; make help for ceph osd tell N bench look
more like injectargs, which says <osd-id or *> to make it clear you
can benchmark all osds simultaneously

Signed-off-by: Dan Mick <dan.mick@inktank.com>

diff --git a/src/test/cli/ceph/help.t b/src/test/cli/ceph/help.t
index a92eb7ca94383c159d9817e3ff4892deb2d9b916..c8d6fa7556cc015cc4ef86a19ac9666102848f74 100644 (file)
--- a/src/test/cli/ceph/help.t
+++ b/src/test/cli/ceph/help.t
@@ -29,6 +29,7 @@
   
   OBJECT STORAGE DEVICE (OSD) COMMANDS
     ceph osd dump [--format=json]
+    ceph osd ls [--format=json]
     ceph osd tree
     ceph osd map <pool-name> <object-name>
     ceph osd down <osd-id>
@@ -60,7 +61,7 @@
     ceph osd scrub <osd-id>
     ceph osd deep-scrub <osd-id>
     ceph osd repair <osd-id>
-    ceph osd tell N bench [bytes per write] [total bytes]
+    ceph osd tell <osd-id or *> bench [bytes per write] [total bytes]
   
   PLACEMENT GROUP (PG) COMMANDS
     ceph pg dump

diff --git a/src/tools/ceph.cc b/src/tools/ceph.cc
index 5dab98f0d26d0231c8ac3251b920d3ec9c7a7482..d5300e69bdd3c5d05428b6c77299cdf7e9e56b38 100644 (file)
--- a/src/tools/ceph.cc
+++ b/src/tools/ceph.cc
@@ -72,6 +72,7 @@ static void usage()
   cout << "\n";
   cout << "OBJECT STORAGE DEVICE (OSD) COMMANDS\n";
   cout << "  ceph osd dump [--format=json]\n";
+  cout << "  ceph osd ls [--format=json]\n";
   cout << "  ceph osd tree\n";
   cout << "  ceph osd map <pool-name> <object-name>\n";
   cout << "  ceph osd down <osd-id>\n";
@@ -103,7 +104,7 @@ static void usage()
   cout << "  ceph osd scrub <osd-id>\n";
   cout << "  ceph osd deep-scrub <osd-id>\n";
   cout << "  ceph osd repair <osd-id>\n";
-  cout << "  ceph osd tell N bench [bytes per write] [total bytes]\n";
+  cout << "  ceph osd tell <osd-id or *> bench [bytes per write] [total bytes]\n";
   cout << "\n";
   cout << "PLACEMENT GROUP (PG) COMMANDS\n";
   cout << "  ceph pg dump\n";