RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-06 16:28:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6426 from xiexingguo/xxg-wip-13642

Browse Source 
librados: fix rare race where pool op callback may hang forever

Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Sage Weil 2015-11-11 09:16:58 -05:00
commit 33c158958b
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/osdc/Objecter.cc
View File

@ -3769,12 +3769,24 @@ void Objecter::handle_pool_op_reply(MPoolOpReply *m)
if (osdmap->get_epoch() < m->epoch) {
rwlock.unlock();
rwlock.get_write();
// recheck op existence since we have let go of rwlock
// (for promotion) above.
iter = pool_ops.find(tid);
if (iter == pool_ops.end())
goto done; // op is gone.
if (osdmap->get_epoch() < m->epoch) {
ldout(cct, 20) << "waiting for client to reach epoch " << m->epoch << " before calling back" << dendl;
_wait_for_new_map(op->onfinish, m->epoch, m->replyCode);
} else {
// map epoch changed, probably because a MOSDMap message
// sneaked in. Do caller-specified callback now or else
// we lose it forever.
assert(op->onfinish);
op->onfinish->complete(m->replyCode);
}
}
else {
assert(op->onfinish);
op->onfinish->complete(m->replyCode);
}
op->onfinish = NULL;
@ -3789,6 +3801,8 @@ void Objecter::handle_pool_op_reply(MPoolOpReply *m)
} else {
ldout(cct, 10) << "unknown request " << tid << dendl;
}
done:
rwlock.unlock();
ldout(cct, 10) << "done" << dendl;