Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
94c026cd
Commit
94c026cd
authored
May 26, 2020
by
antirez
Browse files
Merge branch 'unstable' of github.com:/antirez/redis into unstable
parents
7d359392
caf7c504
Changes
2
Show whitespace changes
Inline
Side-by-side
.github/workflows/daily.yml
View file @
94c026cd
...
...
@@ -49,6 +49,21 @@ jobs:
-
name
:
module api test
run
:
./runtest-moduleapi --verbose
test-tls
:
runs-on
:
ubuntu-latest
steps
:
-
uses
:
actions/checkout@v1
-
name
:
make
run
:
|
make BUILD_TLS=yes
-
name
:
test
run
:
|
sudo apt-get install tcl8.5 tcl-tls
./utils/gen-test-certs.sh
./runtest --accurate --verbose --tls
-
name
:
module api test
run
:
./runtest-moduleapi --verbose --tls
test-valgrind
:
runs-on
:
ubuntu-latest
timeout-minutes
:
14400
...
...
src/replication.c
View file @
94c026cd
...
...
@@ -1035,8 +1035,12 @@ 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
(
!
server
.
tls_replication
)
{
if
((
nwritten
=
redis_sendfile
(
conn
->
fd
,
slave
->
repldbfd
,
slave
->
repldboff
,
PROTO_IOBUF_LEN
))
==
-
1
)
{
...
...
@@ -1047,7 +1051,9 @@ void sendBulkToSlave(connection *conn) {
}
return
;
}
#else
}
#endif
if
(
!
nwritten
)
{
ssize_t
buflen
;
char
buf
[
PROTO_IOBUF_LEN
];
...
...
@@ -1067,7 +1073,8 @@ void sendBulkToSlave(connection *conn) {
}
return
;
}
#endif
}
slave
->
repldboff
+=
nwritten
;
server
.
stat_net_output_bytes
+=
nwritten
;
if
(
slave
->
repldboff
==
slave
->
repldbsize
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment