RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-26 21:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

ReplicatedPG: promote: handle failed promotes

Browse Source 
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 <greg@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Greg Farnum 2013-10-10 09:58:57 -07:00 committed by Sage Weil
parent d15aedbd25
commit 5fa08fb8de
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/osd/ReplicatedPG.h
View File

@ -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<hobject_t,list<OpRequestRef> >::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;
PGBackend *get_pgbackend() {