From 2a3c0e2098d44ea160b0a01de4ce394098928d4a Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Fri, 3 Jun 2016 08:54:06 -0400
Subject: [PATCH] unittest_bluefs: fix more

- wait for aio to finish
- shut down bdev, which stops the aio completion thread
- *then* deallocate the IOContexts

Signed-off-by: Sage Weil <sage@redhat.com>
---
 src/os/bluestore/BlueFS.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/os/bluestore/BlueFS.cc b/src/os/bluestore/BlueFS.cc
index 5dab8fa0386..d8ed6e1d94b 100644
--- a/src/os/bluestore/BlueFS.cc
+++ b/src/os/bluestore/BlueFS.cc
@@ -30,7 +30,6 @@ BlueFS::~BlueFS()
   for (auto p : ioc) {
     if (p)
       p->aio_wait();
-    delete p;
   }
   for (auto p : bdev) {
     if (p) {
@@ -38,6 +37,9 @@ BlueFS::~BlueFS()
       delete p;
     }
   }
+  for (auto p : ioc) {
+    delete p;
+  }
 }
 
 void BlueFS::_init_logger()
-- 
2.39.5