From: Sage Weil <sage@redhat.com>
Date: Tue, 12 Dec 2017 15:24:23 +0000 (-0600)
Subject: osd/PG: carry pg ref for final pg delete txn
X-Git-Tag: wip-pdonnell-testing-20180317.202121~553^2~19
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=4a45a4d568a3251c1f34f1f1b2eb5a71f474713b;p=ceph-ci.git

osd/PG: carry pg ref for final pg delete txn

FileStore breaks of the Sequencer is destroyed while the txn is in flight.

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

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index bca148e3fdb..76660d24283 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -6104,11 +6104,13 @@ void PG::_delete_some()
     ObjectStore::Transaction t;
     PGLog::clear_info_log(info.pgid, &t);
     t.remove_collection(coll);
+    PGRef pgref(this);
     int r = osd->store->queue_transaction(
       osd->meta_osr.get(), std::move(t),
       // keep pg ref around until txn completes to avoid any issues
       // with Sequencer lifecycle (seen w/ filestore).
-      new ContainerContext<PGRef>(this));
+      new ContainerContext<PGRef>(pgref),
+      new ContainerContext<PGRef>(pgref));
     assert(r == 0);
 
     osd->finish_pg_delete(this);