Merge pull request #7519 from xiexingguo/xxg-wip-finisher

librados: shutdown finisher in a more graceful way Reviewed-by: Sage Weil <sage@redhat.com>
ceph · Feb 5, 2016 · c4f9d26 · c4f9d26
2 parents 3368997 + 501ddff
commit c4f9d26
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git 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;

diff --git 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();
 }