Redis/redis-For-Windows
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

writeToClient() properly handles chunk splitting

Browse Source 
In case there are larger amounts of data to be sent back to client they are normally split into up to 64K chunks (unless server exceeds "maxmemory" which causes it to send as much as possible). When writeToClient() returns and has pending replies to be sent - it is scheduled in event loop and when IOCP signals that the socket is writeable again - sendReplyToClient() handler is called and sends additional chunk via writeToClient(). This however behaves differently under Windows and in order to send the following pedning replies - we need to schedule sendReplyToClient() again. Furthermore when we are sending data too fast and receive WSAEWOULDBLOCK error/warning - we back off again and re-schedule sending.

Fixes #11
This commit is contained in:
Tomasz Poradowski
2018-03-17 09:56:14 +01:00
parent 2f87db079b
commit 0da57275af
1 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/networking.c
+29 -3
View File
@@ -970,6 +970,13 @@ int writeToClient(int fd, client *c, int handler_installed) {
server.el, c, o, NULL);
if (result == SOCKET_ERROR && errno != WSA_IO_PENDING) {
nwritten = -1;
//[tporadowski/#11] we might be bursting data too fast, so turn it into another try that will put back the client
// in the sending queue
if (errno == WSAEWOULDBLOCK) {
serverLog(LL_DEBUG, "writeToClient: will try again (EAGAIN) due to WSAEWOULDBLOCK");
errno = EAGAIN;
}
break;
}
c->sentlen += objlen;
@@ -995,7 +1002,7 @@ int writeToClient(int fd, client *c, int handler_installed) {
if (listLength(c->reply) == 0)
serverAssert(c->reply_bytes == 0);
}
}
}
/* Note that we avoid to send more than NET_MAX_WRITES_PER_EVENT
* bytes, in a single threaded server it's a good idea to serve
* other clients as well, even if a very large request comes from
@@ -1007,7 +1014,7 @@ int writeToClient(int fd, client *c, int handler_installed) {
if (totwritten > NET_MAX_WRITES_PER_EVENT &&
(server.maxmemory == 0 ||
zmalloc_used_memory() < server.maxmemory)) break;
}
}
server.stat_net_output_bytes += totwritten;
if (nwritten == -1) {
if (errno == EAGAIN) {
@@ -1043,8 +1050,27 @@ int writeToClient(int fd, client *c, int handler_installed) {
return C_ERR;
}
}
#if _WIN32
/* [tporadowski/#11] too much data was sent in one run, schedule for next available sending slot again.
* We are re-scheduling only when writeToClient was called from sendReplyToClient handler as normally
* handleClientsWithPendingWrites() does this automatically after writeToClient() returns with pending
* replies.
*/
else if (handler_installed) {
if (aeCreateFileEvent(server.el, c->fd, AE_WRITABLE,
sendReplyToClient, c) == AE_ERR)
{
serverLog(LL_WARNING, "writeToClient: aeCreateFileEvent failed");
freeClientAsync(c);
return C_ERR;
}
else {
serverLog(LL_DEBUG, "writeToClient: re-scheduling sendReplyToClient() for pending client replies");
}
}
#endif
return C_OK;
}
}
/* Write event handler. Just send data to the client. */
void sendReplyToClient(aeEventLoop *el, int fd, void *privdata, int mask) {