librbd: flush all in-flight IO on block write and shut down

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

diff --git a/src/librbd/AioImageRequestWQ.cc b/src/librbd/AioImageRequestWQ.cc
index 67a092f597e4ceedeee9efb3e57fcda2612a600a..f57eae97bea578ad00a66788c2b6b31fca4d097d 100644 (file)
--- a/src/librbd/AioImageRequestWQ.cc
+++ b/src/librbd/AioImageRequestWQ.cc
@@ -193,6 +193,8 @@ void AioImageRequestWQ::aio_flush(AioCompletion *c, bool native_async) {
 }
 
 void AioImageRequestWQ::shut_down(Context *on_shutdown) {
+  assert(m_image_ctx.owner_lock.is_locked());
+
   {
     RWLock::WLocker locker(m_lock);
     assert(!m_shutdown);
@@ -207,7 +209,8 @@ void AioImageRequestWQ::shut_down(Context *on_shutdown) {
     }
   }
 
-  on_shutdown->complete(0);
+  // ensure that all in-flight IO is flushed
+  m_image_ctx.flush(on_shutdown);
 }
 
 void AioImageRequestWQ::block_writes() {
@@ -217,6 +220,7 @@ void AioImageRequestWQ::block_writes() {
 }
 
 void AioImageRequestWQ::block_writes(Context *on_blocked) {
+  assert(m_image_ctx.owner_lock.is_locked());
   CephContext *cct = m_image_ctx.cct;
 
   {
@@ -230,7 +234,8 @@ void AioImageRequestWQ::block_writes(Context *on_blocked) {
     }
   }
 
-  m_image_ctx.op_work_queue->queue(on_blocked);
+  // ensure that all in-flight IO is flushed
+  m_image_ctx.flush(on_blocked);
 }
 
 void AioImageRequestWQ::unblock_writes() {
@@ -337,8 +342,9 @@ void AioImageRequestWQ::finish_in_flight_op() {
   CephContext *cct = m_image_ctx.cct;
   ldout(cct, 5) << __func__ << ": completing shut down" << dendl;
 
+  RWLock::RLocker owner_locker(m_image_ctx.owner_lock);
   assert(m_on_shutdown != nullptr);
-  m_on_shutdown->complete(0);
+  m_image_ctx.flush(m_on_shutdown);
 }
 
 bool AioImageRequestWQ::is_journal_required() const {
@@ -362,13 +368,14 @@ void AioImageRequestWQ::queue(AioImageRequest *req) {
                  << "req=" << req << dendl;
 
   assert(m_image_ctx.owner_lock.is_locked());
-  if (req->is_write_op()) {
+  bool write_op = req->is_write_op();
+  if (write_op) {
     m_queued_writes.inc();
   }
 
   ThreadPool::PointerWQ<AioImageRequest>::queue(req);
 
-  if (is_lock_required()) {
+  if (write_op && is_lock_required()) {
     m_image_ctx.exclusive_lock->request_lock(nullptr);
   }
 }