diff options
| author | Salvatore Sanfilippo <antirez@gmail.com> | 2020-05-22 12:25:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-22 12:25:40 +0200 |
| commit | 285817b28abdfc76c573f7c9868cd40af72a5934 (patch) | |
| tree | 858e4a10eacab81706446ef0813b0eed7039de1d | |
| parent | ee93a70e7bc998be6a9e53a9d517db6a2efb89c1 (diff) | |
| parent | 5109f16b7742866251701d61a7a7cbe5fd2d261c (diff) | |
| download | redis-285817b28abdfc76c573f7c9868cd40af72a5934.tar.gz | |
Merge pull request #7305 from madolson/unstable-connection
EAGAIN not handled for TLS during diskless load
| -rw-r--r-- | src/replication.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/replication.c b/src/replication.c index 7eb161f7d..7e981873f 100644 --- a/src/replication.c +++ b/src/replication.c @@ -1526,6 +1526,10 @@ void readSyncBulkPayload(connection *conn) { nread = connRead(conn,buf,readlen); 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", (nread == -1) ? strerror(errno) : "connection lost"); cancelReplicationHandshake(); |