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

osd/ReplicatedPG: fix promote cancellation

Browse Source 
The canceling caller cleans up the blocked objects for us; we simply need
to bail out early.

Signed-off-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2013-12-19 13:14:18 -08:00
parent 923bff1dba
commit 8d31f71b32
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/osd/ReplicatedPG.cc
View File

@ -4882,6 +4882,10 @@ void ReplicatedPG::finish_promote(int r, OpRequestRef op,
dout(10) << __func__ << " " << soid << " r=" << r
<< " uv" << results->user_version << dendl;
if (r == -ECANCELED) {
return;
}
bool whiteout = false;
if (r == -ENOENT &&
(pool.info.cache_mode == pg_pool_t::CACHEMODE_WRITEBACK ||
@ -4900,9 +4904,7 @@ void ReplicatedPG::finish_promote(int r, OpRequestRef op,
if (blocked_iter->second.empty()) {
waiting_for_blocked_object.erase(blocked_iter);
}
if (r != -ECANCELED) { // on cancel the client will resend
osd->reply_op_error(op, r);
}
osd->reply_op_error(op, r);
return;
}