From: Mykola Golub <mgolub@mirantis.com>
Date: Sun, 24 Jan 2016 10:26:36 +0000 (+0200)
Subject: journal: flush commit position on metadata shutdown
X-Git-Tag: v10.0.4~147^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F7385%2Fhead;p=ceph.git

journal: flush commit position on metadata shutdown

A crash was observed on JournalTrimmer destroy, which was called
by the Journaler after metadata shutdown. JournalTrimmer destructor
also calls flush_commit_position, but at that time metadata m_timer
is already null and it crushed there.

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

diff --git a/src/journal/JournalMetadata.cc b/src/journal/JournalMetadata.cc
index 0cd935f2f2e0..e4833a1dc4d6 100644
--- a/src/journal/JournalMetadata.cc
+++ b/src/journal/JournalMetadata.cc
@@ -74,6 +74,8 @@ void JournalMetadata::shutdown() {
     }
   }
 
+  flush_commit_position();
+
   if (m_timer != NULL) {
     Mutex::Locker locker(m_timer_lock);
     m_timer->shutdown();