]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ReplicatedPG::do_op: wait_for_commit even for results < 0 entries
authorSamuel Just <sjust@redhat.com>
Fri, 2 Dec 2016 19:06:50 +0000 (11:06 -0800)
committerSamuel Just <sjust@redhat.com>
Fri, 2 Dec 2016 23:56:09 +0000 (15:56 -0800)
This way, the replies come back in order and we don't expose
uncommitted results.

Signed-off-by: Samuel Just <sjust@redhat.com>
src/osd/ReplicatedPG.cc

index 3143d4e8dc4aa6b9205fee90f61dc177721fd25f..db3f1e20cdb91ca917420a4bdf1640da5ee1060e 100644 (file)
@@ -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()) {