From 1c8c708e43e4c97af17932027ae6b5d26c124c43 Mon Sep 17 00:00:00 2001
From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 23 Dec 2015 12:06:50 -0500
Subject: [PATCH] librbd: ensure librados callbacks are flushed prior to
 destroying image

Fixes: #14092
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 98157ab3274bd960e4487e34f5a83e9c921a6ac8)
---
 src/librbd/ImageCtx.cc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/librbd/ImageCtx.cc b/src/librbd/ImageCtx.cc
index c8df238bf15..3a47565e3ac 100644
--- a/src/librbd/ImageCtx.cc
+++ b/src/librbd/ImageCtx.cc
@@ -246,6 +246,11 @@ void _flush_async_operations(ImageCtx *ictx, Context *on_finish) {
     }
     delete[] format_string;
 
+    md_ctx.aio_flush();
+    data_ctx.aio_flush();
+    op_work_queue->drain();
+    aio_work_queue->drain();
+
     delete op_work_queue;
     delete aio_work_queue;
   }
-- 
2.47.3