From: David Zafman <david.zafman@inktank.com>
Date: Fri, 8 Feb 2013 07:39:11 +0000 (-0800)
Subject: ceph-filestore-dump: Improve error message
X-Git-Tag: v0.58~99
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bd6d4989c91388d0485426836f805aae7aac5158;p=ceph.git

ceph-filestore-dump: Improve error message

Fix error message when encountering already in use
OSD store.

Signed-off-by: David Zafman <david.zafman@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
---

diff --git a/src/tools/ceph-filestore-dump.cc b/src/tools/ceph-filestore-dump.cc
index 2dfa1e539ff2..d7f5f1773ee8 100644
--- a/src/tools/ceph-filestore-dump.cc
+++ b/src/tools/ceph-filestore-dump.cc
@@ -167,14 +167,19 @@ int main(int argc, char **argv)
 
   ObjectStore *fs = new FileStore(fspath, jpath);
   
-  if (fs->mount() < 0) {
-    cout << "mount failed" << std::endl;
+  int r = fs->mount();
+  if (r < 0) {
+    if (r == -EBUSY) {
+      cout << "OSD has the store locked" << std::endl;
+    } else {
+      cout << "Mount failed with '" << cpp_strerror(-r) << "'" << std::endl;
+    }
     return 1;
   }
 
   bool found = false;
   vector<coll_t> ls;
-  int r = fs->list_collections(ls);
+  r = fs->list_collections(ls);
   if (r < 0) {
     cerr << "failed to list pgs: " << cpp_strerror(-r) << std::endl;
     exit(1);