Unverified Commit 285817b2 authored by Salvatore Sanfilippo's avatar Salvatore Sanfilippo Committed by GitHub
Browse files

Merge pull request #7305 from madolson/unstable-connection

EAGAIN not handled for TLS during diskless load
parents ee93a70e 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();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment