summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-09-03 22:40:42 -0700
committerSage Weil <sage@inktank.com>2013-09-04 17:35:24 -0700
commitc4414a34b0b1a6eb393b9e349a72a69a5fb6fdad (patch)
treea276a14804754e15f45f9ecc804b2e44ae4b5055
parent9a551296e0811f2b65972377b25bb28dbb42f575 (diff)
downloadceph-c4414a34b0b1a6eb393b9e349a72a69a5fb6fdad.tar.gz
osd/ReplicatedPG: set reply versions on dup op ACK
All other MOSDOpReply creators do this, with the exception of the pg op. Fixes: #6222 Signed-off-by: Sage Weil <sage@inktank.com> Reviewed-by: Greg Farnum <greg@inktank.com> (cherry picked from commit 5148aac73d50593217455619bef95b8e1b296e10)
-rw-r--r--src/osd/ReplicatedPG.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 2c96180b13a..ef75707ab90 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -915,6 +915,7 @@ void ReplicatedPG::execute_ctx(OpContext *ctx)
if (already_ack(oldv)) {
MOSDOpReply *reply = new MOSDOpReply(m, 0, get_osdmap()->get_epoch(), 0);
reply->add_flags(CEPH_OSD_FLAG_ACK);
+ reply->set_reply_versions(oldv, entry->user_version);
osd->send_message_osd_client(reply, m->get_connection());
} else {
dout(10) << " waiting for " << oldv << " to ack" << dendl;