From: Samuel Just <sjust@redhat.com>
Date: Fri, 2 Dec 2016 19:06:50 +0000 (-0800)
Subject: ReplicatedPG::do_op: wait_for_commit even for results < 0 entries
X-Git-Tag: v11.1.0~58^2~7
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6f0dafcbf7612cd813a845265451a90b834f8aae;p=ceph-ci.git

ReplicatedPG::do_op: wait_for_commit even for results < 0 entries

This way, the replies come back in order and we don't expose
uncommitted results.

Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 3143d4e8dc4..db3f1e20cdb 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -1964,7 +1964,7 @@ void ReplicatedPG::do_op(OpRequestRef& op)
     if (got) {
       dout(3) << __func__ << " dup " << m->get_reqid()
 	      << " was " << replay_version << dendl;
-      if (return_code < 0 || already_complete(replay_version)) {
+      if (already_complete(replay_version)) {
 	osd->reply_op_error(op, return_code, replay_version, user_version);
       } else {
 	if (m->wants_ack()) {