summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-08-30 17:18:21 -0700
committerSage Weil <sage@inktank.com>2013-09-01 08:42:57 -0700
commit72c6c302551eae126d844f452b9195e98dcdbbcc (patch)
treeb3920f723a042ee9a6f32316a76c38b31799c909
parentcc8e9011381a6deb41e322b5a1dc18192d23339c (diff)
downloadceph-72c6c302551eae126d844f452b9195e98dcdbbcc.tar.gz
osd/ReplicatedPG: log previous user_version on clone
Nothing relies on this, but it makes sense to me. Signed-off-by: Sage Weil <sage@inktank.com>
-rw-r--r--src/osd/ReplicatedPG.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index d61d441cb43..025e2d300d4 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -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++;