]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
journal: call metadata shutdown on journal remove
authorMykola Golub <mgolub@mirantis.com>
Mon, 28 Sep 2015 18:37:05 +0000 (21:37 +0300)
committerMykola Golub <mgolub@mirantis.com>
Wed, 11 Nov 2015 15:04:11 +0000 (17:04 +0200)
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>
src/journal/Journaler.cc

index 35854de78acf15139ac9bfb37259f70efd8f58f6..83862fc8221081550a0a2659d39d0f38ac65e6d0 100644 (file)
@@ -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)