From 5a97a9b7ef238c4ceb16225a0b937f9a0cdbb2b6 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Mon, 13 Jun 2016 15:29:43 -0400 Subject: [PATCH] librbd: remove should ignore mirror errors from older OSDs Fixes: http://tracker.ceph.com/issues/16268 Signed-off-by: Jason Dillaman --- src/librbd/internal.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc index a8e4dbff46306..13682df4182ab 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; -- 2.39.5