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

Revert "avoid using sendfile if tls-replication is enabled"

Browse Source 
This reverts commit b9abecfc4c97db01fa6f09180c68a92ea5974ac1.
This commit is contained in:
antirez 2020-06-06 11:42:41 +02:00
parent 84a7a90586
commit 925a2cd5aa
1 changed files with 29 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/replication.c
View File

@ -1067,12 +1067,8 @@ 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 (!server.tls_replication) {
if ((nwritten = redis_sendfile(conn->fd,slave->repldbfd, if ((nwritten = redis_sendfile(conn->fd,slave->repldbfd,
slave->repldboff,PROTO_IOBUF_LEN)) == -1) slave->repldboff,PROTO_IOBUF_LEN)) == -1)
{ {
@ -1083,9 +1079,7 @@ void sendBulkToSlave(connection *conn) {
} }
return; return;
} }
} #else
#endif
if (!nwritten) {
ssize_t buflen; ssize_t buflen;
char buf[PROTO_IOBUF_LEN]; char buf[PROTO_IOBUF_LEN];
@ -1105,8 +1099,7 @@ void sendBulkToSlave(connection *conn) {
} }
return; return;
} }
} #endif
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) {