From 8366907bed1f8e798889f51ce46c8035a28a6cae Mon Sep 17 00:00:00 2001 From: antirez Date: Thu, 11 Jun 2015 12:57:53 +0200 Subject: [PATCH] Use best effort address binding to connect to the master We usually want to reach the master using the address of the interface Redis is bound to (via the "bind" config option). That's useful since the master will get (and publish) the slave address getting the peer name of the incoming socket connection from the slave. However, when this is not possible, for example because the slave is bound to the loopback interface but repliaces from a master accessed via an external interface, we want to still connect with the master even from a different interface: in this case it is not really important that the master will provide any other address, while it is vital to be able to replicate correctly. Related to issues #2609 and #2612. --- src/replication.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/replication.c b/src/replication.c index ca263527adc..c0145b4a1ed 100644 --- a/src/replication.c +++ b/src/replication.c @@ -1384,7 +1384,7 @@ void syncWithMaster(aeEventLoop *el, int fd, void *privdata, int mask) { int connectWithMaster(void) { int fd; - fd = anetTcpNonBlockBindConnect(NULL, + fd = anetTcpNonBlockBestEffortBindConnect(NULL, server.masterhost,server.masterport,REDIS_BIND_ADDR); if (fd == -1) { redisLog(REDIS_WARNING,"Unable to connect to MASTER: %s",