librbd: optionally support disabling journal appends via policy

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit f7eeacd02f8f80c5d1d5d9cfed35bbd23f64b018)

diff --git a/src/librbd/journal/Policy.h b/src/librbd/journal/Policy.h
index 826562228a02183d8d1c2a7645cb587b6f3418bd..85373cd1abc564e9bfa9342e25b3443fa4279e7d 100644 (file)
--- a/src/librbd/journal/Policy.h
+++ b/src/librbd/journal/Policy.h
@@ -14,6 +14,7 @@ struct Policy {
   virtual ~Policy() {
   }
 
+  virtual bool append_disabled() const = 0;
   virtual void allocate_tag_on_lock(Context *on_finish) = 0;
   virtual void cancel_external_replay(Context *on_finish) = 0;
 };

diff --git a/src/librbd/journal/StandardPolicy.h b/src/librbd/journal/StandardPolicy.h
index c49ec9cb4673050ddc51bb68cb41008e72b125f7..e2b1ad7bc8359cfad6ff166505745962180d4a2a 100644 (file)
--- a/src/librbd/journal/StandardPolicy.h
+++ b/src/librbd/journal/StandardPolicy.h
@@ -17,6 +17,9 @@ public:
   StandardPolicy(ImageCtx *image_ctx) : m_image_ctx(image_ctx) {
   }
 
+  virtual bool append_disabled() const {
+    return false;
+  }
   virtual void allocate_tag_on_lock(Context *on_finish);
   virtual void cancel_external_replay(Context *on_finish);
 

diff --git a/src/test/librbd/mock/MockJournalPolicy.h b/src/test/librbd/mock/MockJournalPolicy.h
index e7debfaf535cce6bcba7fc306649589bb291e2a4..c10fd6fbf1f878ea39da53626d1205082c69f1a6 100644 (file)
--- a/src/test/librbd/mock/MockJournalPolicy.h
+++ b/src/test/librbd/mock/MockJournalPolicy.h
@@ -11,6 +11,7 @@ namespace librbd {
 
 struct MockJournalPolicy : public journal::Policy {
 
+  MOCK_CONST_METHOD0(append_disabled, bool());
   MOCK_METHOD1(allocate_tag_on_lock, void(Context*));
   MOCK_METHOD1(cancel_external_replay, void(Context*));
 

diff --git a/src/tools/rbd_mirror/ImageDeleter.cc b/src/tools/rbd_mirror/ImageDeleter.cc
index e4ad55ae60f3ea1510848e496dc1ee0ca0d3b8f8..7c5caee640a238f55a7310f2b533595ad26ae857 100644 (file)
--- a/src/tools/rbd_mirror/ImageDeleter.cc
+++ b/src/tools/rbd_mirror/ImageDeleter.cc
@@ -74,6 +74,10 @@ private:
 };
 
 struct DeleteJournalPolicy : public librbd::journal::Policy {
+  virtual bool append_disabled() const {
+    return true;
+  }
+
   virtual void allocate_tag_on_lock(Context *on_finish) {
     on_finish->complete(0);
   }

diff --git a/src/tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc b/src/tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc
index 35b6863098b46d56e8c4bba41610f12e4acadcc3..0286e522664c4346e5f33a1df08ef4b631b29100 100644 (file)
--- a/src/tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc
+++ b/src/tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc
@@ -43,6 +43,11 @@ struct MirrorJournalPolicy : public librbd::journal::Policy {
   MirrorJournalPolicy(ContextWQ *work_queue) : work_queue(work_queue) {
   }
 
+  virtual bool append_disabled() const {
+    // avoid recording any events to the local journal
+    return true;
+  }
+
   virtual void allocate_tag_on_lock(Context *on_finish) {
     // rbd-mirror will manually create tags by copying them from the peer
     work_queue->queue(on_finish, 0);