From: Mykola Golub <mgolub@mirantis.com>
Date: Mon, 28 Sep 2015 18:37:05 +0000 (+0300)
Subject: journal: call metadata shutdown on journal remove
X-Git-Tag: v10.0.1~85^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0b261e2f83a197f89316a12071b67a145f09ae48;p=ceph.git

journal: call metadata shutdown on journal remove

This fixes error observed when disabling journal:

  JournalMetadata: journal watch error: (107) Transport endpoint is not connected

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
---

diff --git a/src/journal/Journaler.cc b/src/journal/Journaler.cc
index 35854de78acf..83862fc82210 100644
--- a/src/journal/Journaler.cc
+++ b/src/journal/Journaler.cc
@@ -117,6 +117,8 @@ int Journaler::create(uint8_t order, uint8_t splay_width, int64_t pool_id) {
 }
 
 int Journaler::remove() {
+  m_metadata->shutdown();
+
   int r = m_trimmer->remove_objects();
   if (r < 0) {
     lderr(m_cct) << "failed to remove journal objects: " << cpp_strerror(r)