From: Yuan Zhou <yuan.zhou@intel.com>
Date: Mon, 16 May 2016 08:18:59 +0000 (+0800)
Subject: rbd: close journal before removing
X-Git-Tag: v10.2.2~27^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F9548%2Fhead;p=ceph.git

rbd: close journal before removing

Otherwise there is some unwanted error message.

Fixes: http://tracker.ceph.com/issues/15863

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
(cherry picked from commit ecdad4acca635d4b9f0b407889dde9985ab3a506)
---

diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc
index 2445bdacd3b..a392b3933df 100644
--- a/src/librbd/internal.cc
+++ b/src/librbd/internal.cc
@@ -1817,6 +1817,15 @@ int mirror_image_disable_internal(ImageCtx *ictx, bool force,
             }
           }
 
+          C_SaferCond cond;
+          ictx->journal->close(&cond);
+          r = cond.wait();
+          if (r < 0) {
+            lderr(cct) << "error closing image journal: " << cpp_strerror(r)
+                       << dendl;
+            return r;
+          }
+
           r = Journal<>::remove(ictx->md_ctx, ictx->id);
           if (r < 0) {
             lderr(cct) << "error removing image journal: " << cpp_strerror(r)