librbd: force-remove journal when disabling feature and removing image

If mirroring is enabled, it's nearly certain that the peer rbd-mirror
daemon will be a registered client within the journal. Without
forcing the removal, this would prevent the removal from occurring.

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

diff --git a/src/librbd/Journal.cc b/src/librbd/Journal.cc
index b874005843ee7e080eda4adac50a1a7b34916c34..d4ae06bef65b7c9e1ca1aebc671d70b56d5c1692 100644 (file)
--- a/src/librbd/Journal.cc
+++ b/src/librbd/Journal.cc
@@ -424,7 +424,7 @@ int Journal<I>::remove(librados::IoCtx &io_ctx, const std::string &image_id) {
     return r;
   }
 
-  r = journaler.remove(false);
+  r = journaler.remove(true);
   if (r < 0) {
     lderr(cct) << "failed to remove journal: " << cpp_strerror(r) << dendl;
     return r;