From: David Zafman <dzafman@redhat.com>
Date: Mon, 4 Jan 2016 19:00:27 +0000 (-0800)
Subject: ceph-objectstore-tool: Improve error message for --type option
X-Git-Tag: v10.0.3~110^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e7afe6234d32eb2678279e15583917019e2a445c;p=ceph.git

ceph-objectstore-tool: Improve error message for --type option

Signed-off-by: David Zafman <dzafman@redhat.com>
---

diff --git a/src/test/ceph_objectstore_tool.py b/src/test/ceph_objectstore_tool.py
index 1a9df9d12aa1..0d7f4a8bebe2 100755
--- a/src/test/ceph_objectstore_tool.py
+++ b/src/test/ceph_objectstore_tool.py
@@ -888,7 +888,7 @@ def main(argv):
 
     # Specify a bad --type
     cmd = (CFSD_PREFIX + "--type foobar --op list --pgid {pg}").format(osd=ONEOSD, pg=ONEPG)
-    ERRORS += test_failure(cmd, "Must provide --type (filestore, memstore, keyvaluestore)")
+    ERRORS += test_failure(cmd, "Need a valid --type e.g. filestore, memstore, keyvaluestore")
 
     # Don't specify a data-path
     cmd = "./ceph-objectstore-tool --journal-path {dir}/{osd}.journal --type memstore --op list --pgid {pg}".format(dir=OSDDIR, osd=ONEOSD, pg=ONEPG)
diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc
index 5502c84b880c..1988c80b6b35 100644
--- a/src/tools/ceph_objectstore_tool.cc
+++ b/src/tools/ceph_objectstore_tool.cc
@@ -2462,7 +2462,7 @@ int main(int argc, char **argv)
 
   ObjectStore *fs = ObjectStore::create(g_ceph_context, type, dpath, jpath, flags);
   if (fs == NULL) {
-    cerr << "Must provide --type (filestore, memstore, keyvaluestore)" << std::endl;
+    cerr << "Need a valid --type e.g. filestore, memstore, keyvaluestore" << std::endl;
     if (type == "keyvaluestore") {
       cerr << "Add \"keyvaluestore\" to "
            << "enable_experimental_unrecoverable_data_corrupting_features"