thebestvibedev/tromcho.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix "can't get SQE, will fall out of sync with EPOLLET" when overflowing the ring

Browse Source 
OSDs shouldn't crash or hang with long iodepths anymore
This commit is contained in:
Vitaliy Filippov
2020-10-30 01:06:36 +03:00
parent 2ccb75974b
commit 23ea409081
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
msgr_send.cpp
+6 -3
View File
@@ -122,9 +122,6 @@ bool osd_messenger_t::try_send(osd_client_t *cl)
{
return true;
}
cl->write_msg.msg_iov = cl->send_list.data();
cl->write_msg.msg_iovlen = cl->send_list.size();
cl->refs++;
if (ringloop && !use_sync_send_recv)
{
io_uring_sqe* sqe = ringloop->get_sqe();
@@ -132,12 +129,18 @@ bool osd_messenger_t::try_send(osd_client_t *cl)
{
return false;
}
cl->write_msg.msg_iov = cl->send_list.data();
cl->write_msg.msg_iovlen = cl->send_list.size();
cl->refs++;
ring_data_t* data = ((ring_data_t*)sqe->user_data);
data->callback = [this, cl](ring_data_t *data) { handle_send(data->res, cl); };
my_uring_prep_sendmsg(sqe, peer_fd, &cl->write_msg, 0);
}
else
{
cl->write_msg.msg_iov = cl->send_list.data();
cl->write_msg.msg_iovlen = cl->send_list.size();
cl->refs++;
int result = sendmsg(peer_fd, &cl->write_msg, MSG_NOSIGNAL);
if (result < 0)
{