Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
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
Hide whitespace changes
Inline
Side-by-side
.github/workflows/daily.yml
View file @
94c026cd
...
@@ -49,6 +49,21 @@ jobs:
...
@@ -49,6 +49,21 @@ jobs:
-
name
:
module api test
-
name
:
module api test
run
:
./runtest-moduleapi --verbose
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
:
test-valgrind
:
runs-on
:
ubuntu-latest
runs-on
:
ubuntu-latest
timeout-minutes
:
14400
timeout-minutes
:
14400
...
...
src/replication.c
View file @
94c026cd
...
@@ -1035,39 +1035,46 @@ void sendBulkToSlave(connection *conn) {
...
@@ -1035,39 +1035,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
#endif
ssize_t
buflen
;
if
(
!
nwritten
)
{
char
buf
[
PROTO_IOBUF_LEN
];
ssize_t
buflen
;
char
buf
[
PROTO_IOBUF_LEN
];
lseek
(
slave
->
repldbfd
,
slave
->
repldboff
,
SEEK_SET
);
buflen
=
read
(
slave
->
repldbfd
,
buf
,
PROTO_IOBUF_LEN
);
lseek
(
slave
->
repldbfd
,
slave
->
repldboff
,
SEEK_SET
);
if
(
buflen
<=
0
)
{
buflen
=
read
(
slave
->
repldbfd
,
buf
,
PROTO_IOBUF_LEN
);
serverLog
(
LL_WARNING
,
"Read error sending DB to replica: %s"
,
if
(
buflen
<=
0
)
{
(
buflen
==
0
)
?
"premature EOF"
:
strerror
(
errno
));
serverLog
(
LL_WARNING
,
"Read error sending DB to replica: %s"
,
freeClient
(
slave
);
(
buflen
==
0
)
?
"premature EOF"
:
strerror
(
errno
));
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
);
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
;
}
}
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
)
{
...
...
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