]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/ReplicatedPG: log previous user_version on clone
authorSage Weil <sage@inktank.com>
Sat, 31 Aug 2013 00:18:21 +0000 (17:18 -0700)
committerSage Weil <sage@inktank.com>
Sun, 1 Sep 2013 15:42:57 +0000 (08:42 -0700)
Nothing relies on this, but it makes sense to me.

Signed-off-by: Sage Weil <sage@inktank.com>
src/osd/ReplicatedPG.cc

index d61d441cb43f5cd321ec7a960e316300cfa5a1d0..025e2d300d4071354865661cc82f2c4b8449af53 100644 (file)
@@ -3704,8 +3704,9 @@ void ReplicatedPG::make_writeable(OpContext *ctx)
             << " to " << coid << " v " << ctx->at_version
             << " snaps=" << snaps << dendl;
     ctx->log.push_back(pg_log_entry_t(pg_log_entry_t::CLONE, coid, ctx->at_version,
-                                 ctx->obs->oi.version, info.last_user_version,
-                                 ctx->reqid, ctx->new_obs.oi.mtime));
+                                     ctx->obs->oi.version,
+                                     ctx->obs->oi.user_version,
+                                     ctx->reqid, ctx->new_obs.oi.mtime));
     ::encode(snaps, ctx->log.back().snaps);
 
     ctx->at_version.version++;