From: Sage Weil <sage@redhat.com>
Date: Sat, 30 Aug 2014 02:41:28 +0000 (-0700)
Subject: Revert "os/FileJournal: For journal-aio-mode, don't use aio when closing journal."
X-Git-Tag: v0.89~37^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=acfe62e0aa45bff208e38aeedad56eb156ddf07a;p=ceph.git

Revert "os/FileJournal: For journal-aio-mode, don't use aio when closing journal."

This reverts commit e870fd09ce846e5642db268c33bbe8e2e17ffef2.

The aio completion thread will now wait for the final header update aio to
finish; this workaround is no longer necessary.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/os/FileJournal.cc b/src/os/FileJournal.cc
index c47f9b463bd..3cf92fe7e22 100644
--- a/src/os/FileJournal.cc
+++ b/src/os/FileJournal.cc
@@ -1123,9 +1123,7 @@ void FileJournal::write_thread_entry()
     }
     
 #ifdef HAVE_LIBAIO
-    //We hope write_finish_thread_entry return until the last aios complete
-    //when set write_stop. But it can't. So don't use aio mode when shutdown.
-    if (aio && !write_stop) {
+    if (aio) {
       Mutex::Locker locker(aio_lock);
       // should we back off to limit aios in flight?  try to do this
       // adaptively so that we submit larger aios once we have lots of
@@ -1176,7 +1174,7 @@ void FileJournal::write_thread_entry()
     }
 
 #ifdef HAVE_LIBAIO
-    if (aio && !write_stop)
+    if (aio)
       do_aio_write(bl);
     else
       do_write(bl);