From: Sage Weil <sage@redhat.com>
Date: Mon, 24 Aug 2015 15:00:13 +0000 (-0400)
Subject: osd: wait for cleanup from bench
X-Git-Tag: v9.1.0~303^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=622d22e2d4654cd9e85838e5249af17128f23b67;p=ceph.git

osd: wait for cleanup from bench

We need to wait for cleanup to flush before we destroy the
sequencer or else we get a use-after-free.

Introduced e7bbafa3bfbd5e936a8be026a30b83a89f6121c3.

Fixes: #12766
Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index f8660c07c7635..87c47bc25d436 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -5162,6 +5162,12 @@ void OSD::do_command(Connection *con, ceph_tid_t tid, vector<string>& cmd, buffe
 
     // clean up
     store->queue_transaction_and_cleanup(osr.get(), cleanupt);
+    {
+      C_SaferCond waiter;
+      if (!osr->flush_commit(&waiter)) {
+	waiter.wait();
+      }
+    }
 
     uint64_t rate = (double)count / (end - start);
     if (f) {