summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Mick <dan.mick@inktank.com>2012-12-20 15:31:21 -0800
committerDan Mick <dan.mick@inktank.com>2012-12-20 15:51:55 -0800
commit129a49ada12e8d4818dba43d68211773e627acf8 (patch)
tree6f4dde2d6d2cf1f1f767cdac762bd2178cdd5967
parenta36d1db10fd19f35681bbff0217233b1d859565f (diff)
downloadceph-129a49ada12e8d4818dba43d68211773e627acf8.tar.gz
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>
-rw-r--r--src/test/cli/ceph/help.t3
-rw-r--r--src/tools/ceph.cc3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/test/cli/ceph/help.t b/src/test/cli/ceph/help.t
index a92eb7ca943..c8d6fa7556c 100644
--- 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 5dab98f0d26..d5300e69bdd 100644
--- 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";