]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
unittest_bluefs: fix more
authorSage Weil <sage@redhat.com>
Fri, 3 Jun 2016 12:54:06 +0000 (08:54 -0400)
committerSage Weil <sage@redhat.com>
Fri, 3 Jun 2016 12:54:06 +0000 (08:54 -0400)
- 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

index 5dab8fa038660b1238b805a7cb05d7930d3e7900..d8ed6e1d94bc87cc6bb33ec13afc54bdf6f96628 100644 (file)
@@ -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()