From: Samuel Just <sam.just@inktank.com>
Date: Thu, 23 Oct 2014 16:11:28 +0000 (-0700)
Subject: ReplicatedPG: writeout hit_set object with correct prior_version
X-Git-Tag: v0.87~5^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1a3ad307f1a4c0a956d6fd31d13f01ffe411a09d;p=ceph.git

ReplicatedPG: writeout hit_set object with correct prior_version

Fixes: #9875
Backport: giant, firefly
Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index d3311b8f176f3..b90f1c0d618e2 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -11185,7 +11185,7 @@ void ReplicatedPG::hit_set_persist()
       pg_log_entry_t::MODIFY,
       oid,
       ctx->at_version,
-      ctx->obs->oi.version,
+      eversion_t(),
       0,
       osd_reqid_t(),
       ctx->mtime)