From: Samuel Just <sjust@redhat.com>
Date: Sat, 3 Dec 2016 00:15:16 +0000 (-0800)
Subject: ReplicatedPG: always send the ack with the commit
X-Git-Tag: v11.1.0~58^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6b89fac47bdb9c17a37b4aff93939bd803122073;p=ceph.git

ReplicatedPG: always send the ack with the commit

This was always a pretty silly concept and it has gotten in
the way of something else.

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

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index eb1762ec86d83..c1cbe8ce42039 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -8520,23 +8520,6 @@ void ReplicatedPG::eval_repop(RepGather *repop)
 	 repop->on_applied.erase(p++)) {
       (*p)();
     }
-
-    // send dup acks, in order
-    if (waiting_for_ack.count(repop->v)) {
-      assert(waiting_for_ack.begin()->first == repop->v);
-      for (list<pair<OpRequestRef, version_t> >::iterator i =
-	     waiting_for_ack[repop->v].begin();
-	   i != waiting_for_ack[repop->v].end();
-	   ++i) {
-	MOSDOp *m = static_cast<MOSDOp*>(i->first->get_req());
-	MOSDOpReply *reply = new MOSDOpReply(m, 0, get_osdmap()->get_epoch(), 0, true);
-	reply->set_reply_versions(repop->v,
-				  i->second);
-	reply->add_flags(CEPH_OSD_FLAG_ACK);
-	osd->send_message_osd_client(reply, m->get_connection());
-      }
-      waiting_for_ack.erase(repop->v);
-    }
   }
 
   // done.