gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid using sendfile if tls-replication is enabled

Browse Source 
this obviously broke the tests, but went unnoticed so far since tls
wasn't often tested.
This commit is contained in:
Oran Agra 2020-05-26 13:50:59 +03:00
parent b89e6d74fa
commit b9abecfc4c
1 changed files with 36 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/replication.c
View File

@ -1032,39 +1032,46 @@ void sendBulkToSlave(connection *conn) {
} }
} }
/* If the preamble was already transferred, send the RDB bulk data. */ /* If the preamble was already transferred, send the RDB bulk data.
* try to use sendfile system call if supported, unless tls is enabled.
* fallback to normal read+write otherwise. */
nwritten = 0;
#if HAVE_SENDFILE #if HAVE_SENDFILE
if ((nwritten = redis_sendfile(conn->fd,slave->repldbfd, if (!server.tls_replication) {
slave->repldboff,PROTO_IOBUF_LEN)) == -1) if ((nwritten = redis_sendfile(conn->fd,slave->repldbfd,
{ slave->repldboff,PROTO_IOBUF_LEN)) == -1)
if (errno != EAGAIN) { {
serverLog(LL_WARNING,"Sendfile error sending DB to replica: %s", if (errno != EAGAIN) {
strerror(errno)); serverLog(LL_WARNING,"Sendfile error sending DB to replica: %s",
freeClient(slave); strerror(errno));
freeClient(slave);
}
return;
} }
return;
}
#else
ssize_t buflen;
char buf[PROTO_IOBUF_LEN];
lseek(slave->repldbfd,slave->repldboff,SEEK_SET);
buflen = read(slave->repldbfd,buf,PROTO_IOBUF_LEN);
if (buflen <= 0) {
serverLog(LL_WARNING,"Read error sending DB to replica: %s",
(buflen == 0) ? "premature EOF" : strerror(errno));
freeClient(slave);
return;
}
if ((nwritten = connWrite(conn,buf,buflen)) == -1) {
if (connGetState(conn) != CONN_STATE_CONNECTED) {
serverLog(LL_WARNING,"Write error sending DB to replica: %s",
connGetLastError(conn));
freeClient(slave);
}
return;
} }
#endif #endif
if (!nwritten) {
ssize_t buflen;
char buf[PROTO_IOBUF_LEN];
lseek(slave->repldbfd,slave->repldboff,SEEK_SET);
buflen = read(slave->repldbfd,buf,PROTO_IOBUF_LEN);
if (buflen <= 0) {
serverLog(LL_WARNING,"Read error sending DB to replica: %s",
(buflen == 0) ? "premature EOF" : strerror(errno));
freeClient(slave);
return;
}
if ((nwritten = connWrite(conn,buf,buflen)) == -1) {
if (connGetState(conn) != CONN_STATE_CONNECTED) {
serverLog(LL_WARNING,"Write error sending DB to replica: %s",
connGetLastError(conn));
freeClient(slave);
}
return;
}
}
slave->repldboff += nwritten; slave->repldboff += nwritten;
server.stat_net_output_bytes += nwritten; server.stat_net_output_bytes += nwritten;
if (slave->repldboff == slave->repldbsize) { if (slave->repldboff == slave->repldbsize) {