]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rbd-mirror: allow proxied trash snap remove for local image
authorMykola Golub <mgolub@suse.com>
Wed, 30 Oct 2019 13:31:14 +0000 (15:31 +0200)
committerMykola Golub <mgolub@suse.com>
Wed, 20 Nov 2019 08:17:57 +0000 (10:17 +0200)
Fixes: https://tracker.ceph.com/issues/42405
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit b54d0022a4ae770b54cc6a0a598c1acd6c009128)

src/tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc

index aca3f04b8757dfc18c3404d866b1a9900dc6b1f6..6d951bee49d2600c453d724e7fe8d0e692e0ae10 100644 (file)
@@ -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 {