Merge pull request #3643 from andyli028/unstable

Modify MIN->MAX
This commit is contained in:
Salvatore Sanfilippo 2016-12-19 08:19:10 +01:00 committed by GitHub
commit f09a251d37

View File

@ -2774,7 +2774,7 @@ void clusterHandleSlaveFailover(void) {
* and wait for replies), and the failover retry time (the time to wait * and wait for replies), and the failover retry time (the time to wait
* before trying to get voted again). * before trying to get voted again).
* *
* Timeout is MIN(NODE_TIMEOUT*2,2000) milliseconds. * Timeout is MAX(NODE_TIMEOUT*2,2000) milliseconds.
* Retry is two times the Timeout. * Retry is two times the Timeout.
*/ */
auth_timeout = server.cluster_node_timeout*2; auth_timeout = server.cluster_node_timeout*2;