RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-18 17:37:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

AsyncConnection: Don't block process when throttle is full

Browse Source 
If this connection is blocking on throttler and another worker thread
try to acquire this connection's lock, it will deadlock.

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
This commit is contained in:
Haomai Wang 2015-03-10 00:20:24 +08:00
parent a19f92cfa6
commit 1c92cb639d
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/msg/async/AsyncConnection.cc
View File

@ -614,11 +614,16 @@ void AsyncConnection::process()
case STATE_OPEN_MESSAGE_THROTTLE_MESSAGE:
{
if (policy.throttler_messages) {
ldout(async_msgr->cct,10) << __func__ << " wants " << 1 << " message from policy throttler "
<< policy.throttler_messages->get_current() << "/"
<< policy.throttler_messages->get_max() << dendl;
// FIXME: may block
policy.throttler_messages->get();
ldout(async_msgr->cct, 10) << __func__ << " wants " << 1 << " message from policy throttler "
<< policy.throttler_messages->get_current() << "/"
<< policy.throttler_messages->get_max() << dendl;
if (!policy.throttler_messages->get_or_fail()) {
ldout(async_msgr->cct, 1) << __func__ << " wants 1 message from policy throttle "
<< policy.throttler_messages->get_current() << "/"
<< policy.throttler_messages->get_max() << " failed, just wait." << dendl;
center->dispatch_event_external(read_handler);
break;
}
}
state = STATE_OPEN_MESSAGE_THROTTLE_BYTES;
@ -630,11 +635,16 @@ void AsyncConnection::process()
uint64_t message_size = current_header.front_len + current_header.middle_len + current_header.data_len;
if (message_size) {
if (policy.throttler_bytes) {
ldout(async_msgr->cct,10) << __func__ << " wants " << message_size << " bytes from policy throttler "
<< policy.throttler_bytes->get_current() << "/"
<< policy.throttler_bytes->get_max() << dendl;
// FIXME: may block
policy.throttler_bytes->get(message_size);
ldout(async_msgr->cct, 10) << __func__ << " wants " << message_size << " bytes from policy throttler "
<< policy.throttler_bytes->get_current() << "/"
<< policy.throttler_bytes->get_max() << dendl;
if (!policy.throttler_bytes->get_or_fail(message_size)) {
ldout(async_msgr->cct, 10) << __func__ << " wants " << message_size << " bytes from policy throttler "
<< policy.throttler_bytes->get_current() << "/"
<< policy.throttler_bytes->get_max() << " failed, just wait." << dendl;
center->dispatch_event_external(read_handler);
break;
}
}
}