diff options
| -rw-r--r-- | src/init-radosgw | 2 | ||||
| -rw-r--r-- | src/init-radosgw.sysv | 2 | ||||
| -rw-r--r-- | src/osd/ReplicatedPG.cc | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/init-radosgw b/src/init-radosgw index a526441c3a0..de1e01e0018 100644 --- a/src/init-radosgw +++ b/src/init-radosgw @@ -83,7 +83,7 @@ case "$1" in echo "$RADOSGW is running." else echo "$RADOSGW is not running." - RETVAL=1 + exit 1 fi ;; *) diff --git a/src/init-radosgw.sysv b/src/init-radosgw.sysv index e08e1bd1b1b..017e3f9bc07 100644 --- a/src/init-radosgw.sysv +++ b/src/init-radosgw.sysv @@ -90,7 +90,7 @@ case "$1" in echo "$RADOSGW is running." else echo "$RADOSGW is not running." - RETVAL=1 + exit 1 fi ;; *) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 2c96180b13a..d8aa8b1d02b 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -571,6 +571,7 @@ void ReplicatedPG::do_pg_op(OpRequestRef op) CEPH_OSD_FLAG_ACK | CEPH_OSD_FLAG_ONDISK); reply->set_data(outdata); reply->set_result(result); + reply->set_reply_versions(info.last_update, info.last_user_version); osd->send_message_osd_client(reply, m->get_connection()); delete filter; } @@ -915,6 +916,7 @@ void ReplicatedPG::execute_ctx(OpContext *ctx) if (already_ack(oldv)) { MOSDOpReply *reply = new MOSDOpReply(m, 0, get_osdmap()->get_epoch(), 0); reply->add_flags(CEPH_OSD_FLAG_ACK); + reply->set_reply_versions(oldv, entry->user_version); osd->send_message_osd_client(reply, m->get_connection()); } else { dout(10) << " waiting for " << oldv << " to ack" << dendl; |