From: Greg Farnum <gregory.farnum@dreamhost.com>
Date: Fri, 18 Nov 2011 16:49:35 +0000 (-0800)
Subject: osd: error responses should trigger all requested notifications.
X-Git-Tag: v0.39~34
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dedf2c4a066876bdab9a0b0154196194cefc1340;p=ceph-ci.git

osd: error responses should trigger all requested notifications.

There's no good reason I can find to limit error code responses to
the ACK.

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index c3df7232102..791f5763961 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -5096,12 +5096,7 @@ void OSD::reply_op_error(MOSDOp *op, int err)
 void OSD::reply_op_error(MOSDOp *op, int err, eversion_t v)
 {
   int flags;
-  if (err == 0)
-    // reply with whatever ack/safe flags the caller wanted
-    flags = op->get_flags() & (CEPH_OSD_FLAG_ACK|CEPH_OSD_FLAG_ONDISK);
-  else
-    // just ACK on error
-    flags = CEPH_OSD_FLAG_ACK;
+  flags = op->get_flags() & (CEPH_OSD_FLAG_ACK|CEPH_OSD_FLAG_ONDISK);
 
   MOSDOpReply *reply = new MOSDOpReply(op, err, osdmap->get_epoch(), flags);
   Messenger *msgr = client_messenger;