Browse files

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

Bug fix: slaves being pinged every second
  • Loading branch information...
2 parents 36741b2 + 9edfe63 commit 24bc807b5c781ba0f8d0582d47bde237d6748a5d @antirez committed Sep 5, 2012
Showing with 2 additions and 2 deletions.
  1. +1 −1 src/redis.h
  2. +1 −1 src/replication.c
View
2 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 */
View
2 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;

0 comments on commit 24bc807

Please sign in to comment.