From: Sage Weil <sage@redhat.com>
Date: Thu, 7 Jan 2016 18:04:09 +0000 (-0500)
Subject: ceph-objectstore-tool: simplify error message
X-Git-Tag: v10.0.4~154^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0ed0ec52b4c4e7eaebe6c2300f7a059e989540d5;p=ceph.git

ceph-objectstore-tool: simplify error message

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

diff --git a/src/test/ceph_objectstore_tool.py b/src/test/ceph_objectstore_tool.py
index e79857a109cf..b34c59a807fc 100755
--- a/src/test/ceph_objectstore_tool.py
+++ b/src/test/ceph_objectstore_tool.py
@@ -889,7 +889,7 @@ def main(argv):
     # Specify a bad --type
     os.mkdir(OSDDIR + "/fakeosd")
     cmd = ("./ceph-objectstore-tool --data-path " + OSDDIR + "/{osd} --type foobar --op list --pgid {pg}").format(osd="fakeosd", pg=ONEPG)
-    ERRORS += test_failure(cmd, "Need a valid --type e.g. filestore, memstore")
+    ERRORS += test_failure(cmd, "Unable to create store of type foobar")
 
     # Don't specify a data-path
     cmd = "./ceph-objectstore-tool --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 dd8a7470da35..3b1b093e325c 100644
--- a/src/tools/ceph_objectstore_tool.cc
+++ b/src/tools/ceph_objectstore_tool.cc
@@ -2467,7 +2467,7 @@ int main(int argc, char **argv)
 
   ObjectStore *fs = ObjectStore::create(g_ceph_context, type, dpath, jpath, flags);
   if (fs == NULL) {
-    cerr << "Need a valid --type e.g. filestore, memstore" << std::endl;
+    cerr << "Unable to create store of type " << type << std::endl;
     myexit(1);
   }