From 5fa08fb8de2ab6dbac579f1926cfe26af3922374 Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Thu, 10 Oct 2013 09:58:57 -0700 Subject: [PATCH] ReplicatedPG: promote: handle failed promotes If we get an error back, reply to the client directly and remove the op which triggered promotion from our blocked op queue. Signed-off-by: Greg Farnum Reviewed-by: Sage Weil --- src/osd/ReplicatedPG.h | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h index 5e8aa21e1a131..43c61b72e4176 100644 --- a/src/osd/ReplicatedPG.h +++ b/src/osd/ReplicatedPG.h @@ -223,11 +223,27 @@ public: virtual void finish(CopyCallbackResults results) { CopyResults* results_data = results.get<1>(); - assert(results.get<0>() == 0); // we don't handle errors right now - pg->finish_promote(results_data, obc, temp_obj); + int r = results.get<0>(); + if (r >= 0) { + pg->finish_promote(results_data, obc, temp_obj); + } else { + // we need to get rid of the op in the blocked queue + map >::iterator blocked_iter; + blocked_iter = pg->waiting_for_blocked_object.find(obc->obs.oi.soid); + assert(blocked_iter != pg->waiting_for_blocked_object.end()); + assert(blocked_iter->second.begin()->get() == op.get()); + blocked_iter->second.pop_front(); + if (blocked_iter->second.empty()) { + pg->waiting_for_blocked_object.erase(blocked_iter); + } + if (r != -ECANCELED) { // on cancel the client will resend + pg->osd->reply_op_error(op, r); + } + } delete results_data; } }; + friend class PromoteCallback; boost::scoped_ptr pgbackend; PGBackend *get_pgbackend() { -- 2.39.5