]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ReplicatedPG::trim_object: use old_snaps for rollback 1397/head
authorSamuel Just <sam.just@inktank.com>
Thu, 6 Mar 2014 22:59:47 +0000 (14:59 -0800)
committerSamuel Just <sam.just@inktank.com>
Thu, 6 Mar 2014 23:01:04 +0000 (15:01 -0800)
We need to rollback the old value of snaps, not the
new one.

Fixes: #7638
Signed-off-by: Samuel Just <sam.just@inktank.com>
src/osd/ReplicatedPG.cc

index 6c9d5ecf484151f1ec54861b991ef89abca6556b..c8d28f22fdbefd6c61c64de8508a97f941b72089 100644 (file)
@@ -2356,7 +2356,7 @@ ReplicatedPG::RepGather *ReplicatedPG::trim_object(const hobject_t &coid)
       set<snapid_t> snaps(
        ctx->obc->obs.oi.snaps.begin(),
        ctx->obc->obs.oi.snaps.end());
-      ctx->log.back().mod_desc.update_snaps(snaps);
+      ctx->log.back().mod_desc.update_snaps(old_snaps);
     } else {
       ctx->log.back().mod_desc.mark_unrollbackable();
     }