]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ReplicatedPG::trim_object: write filtered snapset while we're at it 4805/head
authorSamuel Just <sjust@redhat.com>
Wed, 27 May 2015 18:14:15 +0000 (11:14 -0700)
committerSamuel Just <sjust@redhat.com>
Wed, 27 May 2015 18:31:50 +0000 (11:31 -0700)
If we trimmed an object, we might as well remove the obsolete snaps
as well.

Signed-off-by: Samuel Just <sjust@redhat.com>
src/osd/ReplicatedPG.cc

index bdcfd20e47ff7d4aadba8c1d55627ef5ea606f35..e99d184ad47204eaa0140e711df34a9df41662da 100644 (file)
@@ -2865,7 +2865,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,