From c9b55a29d644d6703c00daa0da31c0eec8143dfc Mon Sep 17 00:00:00 2001 From: antirez Date: Mon, 27 May 2013 11:24:05 +0200 Subject: [PATCH] redis.conf updated: repl-timeout now uesd by masters as well. --- redis.conf | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/redis.conf b/redis.conf index 5a88c3116..33e7a62e1 100644 --- a/redis.conf +++ b/redis.conf @@ -203,8 +203,11 @@ slave-read-only yes # # repl-ping-slave-period 10 -# The following option sets a timeout for both Bulk transfer I/O timeout and -# master data or ping response timeout. The default value is 60 seconds. +# The following option sets the replication timeout for: +# +# 1) Bulk transfer I/O during SYNC, from the point of view of slave. +# 2) Master timeout from the point of view of slaves (data, pings). +# 3) Slave timeout from the point of view of masters (REPLCONF ACK pings). # # It is important to make sure that this value is greater than the value # specified for repl-ping-slave-period otherwise a timeout will be detected -- GitLab