]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ReplicatedPG::finish_ctx: use correct snapdir prior version in events
authorSamuel Just <sam.just@inktank.com>
Tue, 4 Mar 2014 06:22:39 +0000 (22:22 -0800)
committerSamuel Just <sam.just@inktank.com>
Tue, 4 Mar 2014 23:00:20 +0000 (15:00 -0800)
Fixes: #7595
Reviewed-by: Greg Farnum <greg@inktank.com>
Signed-off-by: Samuel Just <sam.just@inktank.com>
src/osd/ReplicatedPG.cc

index 3d4af48be46f948ac05c5da78d81517fa05f4362..6561429fb9ce1effdb80b19041debc2ab9262b00 100644 (file)
@@ -4979,7 +4979,7 @@ void ReplicatedPG::finish_ctx(OpContext *ctx, int log_op_type)
          ctx->release_snapset_obc = true;
          ctx->log.push_back(pg_log_entry_t(pg_log_entry_t::DELETE, snapoid,
              ctx->at_version,
-             ctx->obs->oi.version,
+             ctx->snapset_obc->obs.oi.version,
              0, osd_reqid_t(), ctx->mtime));
          if (pool.info.require_rollback()) {
            if (ctx->log.back().mod_desc.rmobject(ctx->at_version.version)) {
@@ -5006,7 +5006,7 @@ void ReplicatedPG::finish_ctx(OpContext *ctx, int log_op_type)
               << " in " << snapoid << dendl;
       ctx->log.push_back(pg_log_entry_t(pg_log_entry_t::MODIFY, snapoid,
                                        ctx->at_version,
-                                       ctx->obs->oi.version,
+                                       eversion_t(),
                                        0, osd_reqid_t(), ctx->mtime));
 
       ctx->snapset_obc = get_object_context(snapoid, true);