From: Samuel Just <sam.just@inktank.com>
Date: Sun, 21 Sep 2014 17:19:43 +0000 (-0700)
Subject: ReplicatedPG::on_removal: clear rollback info
X-Git-Tag: v0.80.8~30^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=037aa342fa277351fc605da41489a6ceba81ab05;p=ceph.git

ReplicatedPG::on_removal: clear rollback info

Fixes: #9293
Backport: firefly
Signed-off-by: Samuel Just <sam.just@inktank.com>
(cherry picked from commit 544b8c7ffb4af01765b87239f2d7ab88479ee779)
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index d8a6ce68ce50..95f710c8380c 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -9339,6 +9339,13 @@ void ReplicatedPG::on_removal(ObjectStore::Transaction *t)
   // adjust info to backfill
   info.last_backfill = hobject_t();
   dirty_info = true;
+
+
+  // clear log
+  PGLogEntryHandler rollbacker;
+  pg_log.clear_can_rollback_to(&rollbacker);
+  rollbacker.apply(this, t);
+
   write_if_dirty(*t);
 
   on_shutdown();