From: David Zafman <dzafman@redhat.com>
Date: Sat, 31 Jan 2015 00:56:10 +0000 (-0800)
Subject: ceph-objectstore-tool: If object re-appears after removal, just skip it
X-Git-Tag: v0.94.7~28^2~11^2~24
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cc5fa68c184f66d3ca6ff736eb308cba0a0d10b0;p=ceph.git

ceph-objectstore-tool: If object re-appears after removal, just skip it

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

diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc
index 8c08455e443..fa6baa4a5f9 100644
--- a/src/tools/ceph_objectstore_tool.cc
+++ b/src/tools/ceph_objectstore_tool.cc
@@ -1338,6 +1338,12 @@ int get_object_rados(librados::IoCtx &ioctx, bufferlist &bl, bool no_overwrite)
           return ret;
         }
         ret = ioctx.create(ob.hoid.hobj.oid.name, true);
+        // If object re-appeared after removal, let's just skip it
+        if (ret == -EEXIST) {
+          skipping = true;
+          msg = "Skipping in-use object";
+          ret = 0;
+        }
         if (ret < 0) {
           cerr << "create failed: " << cpp_strerror(ret) << std::endl;
           return ret;