]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-objectstore-tool: Ignore snapset error if just removing head with --force
authorDavid Zafman <dzafman@redhat.com>
Tue, 27 Aug 2019 04:49:40 +0000 (04:49 +0000)
committerPrashant D <pdhange@redhat.com>
Mon, 2 Sep 2019 23:04:27 +0000 (19:04 -0400)
Fixes: https://tracker.ceph.com/issues/41522
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 2e5fcf7b46d1f58fbb4e96e73bce543c90f86c65)

src/tools/ceph_objectstore_tool.cc

index 162cec99a6a0e579bbdc5957568b9d698718e08a..bef0be6166322b7c02ac9842f7e0e7118be0b962 100644 (file)
@@ -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) {