From: Sage Weil <sage@redhat.com>
Date: Mon, 26 Feb 2018 19:45:28 +0000 (-0600)
Subject: osd/PG: ensure an actual transaction gets queued for recovery finish
X-Git-Tag: v13.1.0~390^2~37
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=494d02c34990d2ef5ba873c11051048e9e8f504e;p=ceph.git

osd/PG: ensure an actual transaction gets queued for recovery finish

Otherwise, this context gets leaked and lost.

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

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 09696d10ad90..a7e5a4a49390 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -7774,6 +7774,7 @@ PG::RecoveryState::Clean::Clean(my_context ctx)
   }
   Context *c = pg->finish_recovery();
   context< RecoveryMachine >().get_cur_transaction()->register_on_commit(c);
+  context< RecoveryMachine >().get_cur_transaction()->nop();
 
   if (pg->is_active()) {
     pg->mark_clean();