From be9c0efc286a34462826c90701e01c1261d24738 Mon Sep 17 00:00:00 2001 From: xie xingguo Date: Thu, 4 Feb 2016 16:19:27 +0800 Subject: [PATCH 1/2] os/filestore/JournalingObjectStore: stop journal in a more graceful way Signed-off-by: xie xingguo --- src/os/filestore/JournalingObjectStore.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/os/filestore/JournalingObjectStore.cc b/src/os/filestore/JournalingObjectStore.cc index 4708d8a22e3c2..100ae6610625b 100644 --- a/src/os/filestore/JournalingObjectStore.cc +++ b/src/os/filestore/JournalingObjectStore.cc @@ -20,6 +20,7 @@ void JournalingObjectStore::journal_start() void JournalingObjectStore::journal_stop() { dout(10) << "journal_stop" << dendl; + finisher.wait_for_empty(); finisher.stop(); } From 501ddff4f0876899db28e9f51c45d9ffadf43f0f Mon Sep 17 00:00:00 2001 From: xie xingguo Date: Thu, 4 Feb 2016 16:22:56 +0800 Subject: [PATCH 2/2] librados/RadosClient: stop client's finisher in a more graceful way Signed-off-by: xie xingguo --- src/librados/RadosClient.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/librados/RadosClient.cc b/src/librados/RadosClient.cc index 09dd64a36acc2..a77f7719895df 100644 --- a/src/librados/RadosClient.cc +++ b/src/librados/RadosClient.cc @@ -333,6 +333,7 @@ void librados::RadosClient::shutdown() return; } if (state == CONNECTED) { + finisher.wait_for_empty(); finisher.stop(); } bool need_objecter = false;