From: Jason Dillaman <dillaman@redhat.com>
Date: Mon, 17 Oct 2016 13:48:20 +0000 (-0400)
Subject: journal: do not prematurely flag object recorder as closed
X-Git-Tag: v10.2.4~14^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f5e37abefcb015b2cb58295cfdf109fd6f5833b0;p=ceph.git

journal: do not prematurely flag object recorder as closed

Fixes: http://tracker.ceph.com/issues/17590
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 2be6367cb0119d86dfecfa94eb4a3a102c40162a)
---

diff --git a/src/journal/ObjectRecorder.cc b/src/journal/ObjectRecorder.cc
index 58dd14df1d80..a2faeae8aa60 100644
--- a/src/journal/ObjectRecorder.cc
+++ b/src/journal/ObjectRecorder.cc
@@ -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() {