import ceph 14.2.5

[ceph.git] / ceph / src / tools / ceph_objectstore_tool.cc

diff --git a/ceph/src/tools/ceph_objectstore_tool.cc b/ceph/src/tools/ceph_objectstore_tool.cc
index 162cec99a6a0e579bbdc5957568b9d698718e08a..bef0be6166322b7c02ac9842f7e0e7118be0b962 100644 (file)
--- a/ceph/src/tools/ceph_objectstore_tool.cc
+++ b/ceph/src/tools/ceph_objectstore_tool.cc
@@ -1947,7 +1947,9 @@ int do_remove_object(ObjectStore *store, coll_t coll,
     r = get_snapset(store, coll, ghobj, ss, false);
     if (r < 0) {
       cerr << "Can't get snapset error " << cpp_strerror(r) << std::endl;
-      return r;
+      // If --force and bad snapset let them remove the head
+      if (!(force && !all))
+        return r;
     }
     if (!ss.snaps.empty() && !all) {
       if (force) {