From: Mykola Golub <mgolub@suse.com>
Date: Wed, 30 Oct 2019 13:31:14 +0000 (+0200)
Subject: rbd-mirror: allow proxied trash snap remove for local image
X-Git-Tag: v14.2.8~20^2~69^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c0dc9345d45a770c4ad63e844cf2a86ee88379d6;p=ceph.git

rbd-mirror: allow proxied trash snap remove for local image

Fixes: https://tracker.ceph.com/issues/42405

Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit b54d0022a4ae770b54cc6a0a598c1acd6c009128)
---

diff --git a/src/tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc b/src/tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc
index d405e324336..87b141ca6c9 100644
--- a/src/tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc
+++ b/src/tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc
@@ -60,6 +60,14 @@ struct MirrorExclusiveLockPolicy : public librbd::exclusive_lock::Policy {
     return r;
   }
 
+  bool accept_blocked_request(
+      librbd::exclusive_lock::OperationRequestType request_type) override {
+    if (request_type ==
+        librbd::exclusive_lock::OPERATION_REQUEST_TYPE_TRASH_SNAP_REMOVE) {
+      return true;
+    }
+    return false;
+  }
 };
 
 struct MirrorJournalPolicy : public librbd::journal::Policy {