]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
journal: do not prematurely flag object recorder as closed 11634/head
authorJason Dillaman <dillaman@redhat.com>
Mon, 17 Oct 2016 13:48:20 +0000 (09:48 -0400)
committerJason Dillaman <dillaman@redhat.com>
Tue, 25 Oct 2016 00:41:55 +0000 (20:41 -0400)
Fixes: http://tracker.ceph.com/issues/17590
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 2be6367cb0119d86dfecfa94eb4a3a102c40162a)

src/journal/ObjectRecorder.cc

index 58dd14df1d801d2b84bfb335e6f2eb600fe91e82..a2faeae8aa60e1aadd7e17a1491d09b081d2e330 100644 (file)
@@ -173,7 +173,7 @@ bool ObjectRecorder::close() {
 
   assert(!m_object_closed);
   m_object_closed = true;
-  return m_in_flight_tids.empty() && !m_aio_scheduled;
+  return (m_in_flight_tids.empty() && !m_in_flight_flushes && !m_aio_scheduled);
 }
 
 void ObjectRecorder::handle_append_task() {