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
5109f16b
Commit
5109f16b
authored
May 21, 2020
by
Madelyn Olson
Browse files
EAGAIN for tls during diskless load
parent
fe640e58
Changes
1
Show whitespace changes
Inline
Side-by-side
src/replication.c
View file @
5109f16b
...
@@ -1526,6 +1526,10 @@ void readSyncBulkPayload(connection *conn) {
...
@@ -1526,6 +1526,10 @@ void readSyncBulkPayload(connection *conn) {
nread = connRead(conn,buf,readlen);
nread = connRead(conn,buf,readlen);
if (nread <= 0) {
if (nread <= 0) {
if (connGetState(conn) == CONN_STATE_CONNECTED) {
/* equivalent to EAGAIN */
return;
}
serverLog(LL_WARNING,"I/O error trying to sync with MASTER: %s",
serverLog(LL_WARNING,"I/O error trying to sync with MASTER: %s",
(nread == -1) ? strerror(errno) : "connection lost");
(nread == -1) ? strerror(errno) : "connection lost");
cancelReplicationHandshake();
cancelReplicationHandshake();
...
...
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