]> 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)
committerDavid Zafman <dzafman@redhat.com>
Tue, 27 Aug 2019 04:57:47 +0000 (04:57 +0000)
Fixes: https://tracker.ceph.com/issues/41522
Signed-off-by: David Zafman <dzafman@redhat.com>
src/tools/ceph_objectstore_tool.cc

index 0ea7fce95ae40cdf69513409ff327f7a2d538362..c91403d68137c6e96d0b492793270807cfd5466e 100644 (file)
@@ -2083,7 +2083,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;
     }
 //    cout << "snapset " << ss << std::endl;
     if (!ss.clone_snaps.empty() && !all) {