From: David Zafman <dzafman@redhat.com>
Date: Mon, 15 Dec 2014 18:03:53 +0000 (-0800)
Subject: ceph_objectstore_tool: Add special exit code for test infrastructure
X-Git-Tag: v0.80.10~69^2~9
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=aa472fa4df19d826a5af72e286365fa5ce4c71fb;p=ceph.git

ceph_objectstore_tool: Add special exit code for test infrastructure

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit b1f12f09c0211b608178f5ca2e292ab1765ce620)
---

diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc
index bc98b615c16d8..52f1dc10374a4 100644
--- a/src/tools/ceph_objectstore_tool.cc
+++ b/src/tools/ceph_objectstore_tool.cc
@@ -1617,7 +1617,8 @@ int do_import(ObjectStore *store, OSDSuperblock& sb)
   }
   if (!curmap.have_pg_pool(pgid.pgid.m_pool)) {
     cerr << "Pool " << pgid.pgid.m_pool << " no longer exists" << std::endl;
-    return 1;
+    // Special exit code for this error, used by test code
+    return 10;
   }
 
   log_oid = OSD::make_pg_log_oid(pgid);
@@ -2944,5 +2945,5 @@ out:
     return 1;
   }
 
-  return (ret != 0);
+  return ret;
 }