]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
librbd: ignore -ENOENT error when disabling object-map
authorJason Dillaman <dillaman@redhat.com>
Mon, 12 Oct 2020 19:28:52 +0000 (15:28 -0400)
committerJason Dillaman <dillaman@redhat.com>
Mon, 12 Oct 2020 19:28:52 +0000 (15:28 -0400)
Fixes: https://tracker.ceph.com/issues/47840
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
src/librbd/operation/DisableFeaturesRequest.cc

index dafbf422c8db761ea96c8bdae8229ac61ade6803..a7f7eca0609242f26c1a8394067e597b5100e5dd 100644 (file)
@@ -484,7 +484,7 @@ Context *DisableFeaturesRequest<I>::handle_remove_object_map(int *result) {
   CephContext *cct = image_ctx.cct;
   ldout(cct, 20) << this << " " << __func__ << ": r=" << *result << dendl;
 
-  if (*result < 0) {
+  if (*result < 0 && *result != -ENOENT) {
     lderr(cct) << "failed to remove object map: " << cpp_strerror(*result) << dendl;
     return handle_finish(*result);
   }