Merge pull request #576 from saj/fix-slave-ping-period

Bug fix: slaves being pinged every second

diff --git a/src/redis.h b/src/redis.h
index 5e4ee844c9879e2948bf79d46680a193ac8bd5a0..ec2bde2219a7ada61e1fe2d832b03a0136d17fe2 100644 (file)
--- a/src/redis.h
+++ b/src/redis.h
@@ -679,7 +679,7 @@ struct redisServer {
     char *masterauth;               /* AUTH with this password with master */
     char *masterhost;               /* Hostname of master */
     int masterport;                 /* Port of master */
-    int repl_ping_slave_period;     /* Master pings the salve every N seconds */
+    int repl_ping_slave_period;     /* Master pings the slave every N seconds */
     int repl_timeout;               /* Timeout after N seconds of master idle */
     redisClient *master;     /* Client that is master for this slave */
     int repl_syncio_timeout; /* Timeout for synchronous I/O calls */

diff --git a/src/replication.c b/src/replication.c
index 72b88977afeb7aa5f7b161fc15a7445726aea2f3..b43e9927f5886cc1c77ede523d38a68ba7fda599 100644 (file)
--- a/src/replication.c
+++ b/src/replication.c
@@ -744,7 +744,7 @@ void replicationCron(void) {
      * So slaves can implement an explicit timeout to masters, and will
      * be able to detect a link disconnection even if the TCP connection
      * will not actually go down. */
-    if (!(server.cronloops % (server.repl_ping_slave_period*10))) {
+    if (!(server.cronloops % (server.repl_ping_slave_period * REDIS_HZ))) {
         listIter li;
         listNode *ln;