ReplicatedPG::trim_object: write filtered snapset while we're at it

If we trimmed an object, we might as well remove the obsolete snaps
as well.

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 90eb7768f99ea249952df195a844a3a7c9a59b78)

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 1a07b1fd87d520ad3170ab4d1a95896ca7554f82..f9d7f191ab92b172f102fbdbb2cfe9e8b9eb8610 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -2835,7 +2835,10 @@ ReplicatedPG::RepGather *ReplicatedPG::trim_object(const hobject_t &coid)
       ctx->log.back().mod_desc.mark_unrollbackable();
     }
   } else {
-    dout(10) << coid << " updating snapset on " << snapoid << dendl;
+    dout(10) << coid << " filtering snapset on " << snapoid << dendl;
+    snapset.filter(pool.info);
+    dout(10) << coid << " writing updated snapset on " << snapoid
+            << ", snapset is " << snapset << dendl;
     ctx->log.push_back(
       pg_log_entry_t(
        pg_log_entry_t::MODIFY,