diff options
| author | Greg Farnum <gregory.farnum@dreamhost.com> | 2011-11-18 08:49:35 -0800 |
|---|---|---|
| committer | Greg Farnum <gregory.farnum@dreamhost.com> | 2011-11-18 09:49:57 -0800 |
| commit | dedf2c4a066876bdab9a0b0154196194cefc1340 (patch) | |
| tree | 0027b268c9fcb966b5c471334763887a8188e09d | |
| parent | 09c20c51299cd0251b4512d8e73c4190531eace0 (diff) | |
| download | ceph-dedf2c4a066876bdab9a0b0154196194cefc1340.tar.gz | |
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>
| -rw-r--r-- | src/osd/OSD.cc | 7 |
1 files changed, 1 insertions, 6 deletions
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; |