summaryrefslogtreecommitdiffstats
path: root/src/journal
diff options
context:
space:
mode:
authorMykola Golub <mgolub@mirantis.com>2015-09-28 20:37:05 +0200
committerMykola Golub <mgolub@mirantis.com>2015-11-11 16:04:11 +0100
commit0b261e2f83a197f89316a12071b67a145f09ae48 (patch)
treed33ec9f3516a06b9767dd61bfe9506266d34c528 /src/journal
parentjournal: don't use object_number when comparing positions (diff)
downloadceph-0b261e2f83a197f89316a12071b67a145f09ae48.tar.xz
ceph-0b261e2f83a197f89316a12071b67a145f09ae48.zip
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>
Diffstat (limited to 'src/journal')
-rw-r--r--src/journal/Journaler.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/journal/Journaler.cc b/src/journal/Journaler.cc
index 35854de78ac..83862fc8221 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)