From: Jason Dillaman <dillaman@redhat.com>
Date: Mon, 13 Jun 2016 19:29:43 +0000 (-0400)
Subject: librbd: remove should ignore mirror errors from older OSDs
X-Git-Tag: v10.2.2~1^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F9692%2Fhead;p=ceph.git

librbd: remove should ignore mirror errors from older OSDs

Fixes: http://tracker.ceph.com/issues/16268
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 5a97a9b7ef238c4ceb16225a0b937f9a0cdbb2b6)
---

diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc
index a8e4dbff4630..13682df4182a 100644
--- a/src/librbd/internal.cc
+++ b/src/librbd/internal.cc
@@ -2174,7 +2174,7 @@ int mirror_image_disable_internal(ImageCtx *ictx, bool force,
 
       ldout(cct, 2) << "removing image from rbd_mirroring object..." << dendl;
       r = cls_client::mirror_image_remove(&io_ctx, id);
-      if (r < 0 && r != -ENOENT) {
+      if (r < 0 && r != -ENOENT && r != -EOPNOTSUPP) {
         lderr(cct) << "failed to remove image from mirroring directory: "
                    << cpp_strerror(r) << dendl;
         return r;