summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2015-05-04 12:50:44 +0200
committerantirez <antirez@gmail.com>2015-05-04 12:50:44 +0200
commit99c93f34a76fd7b64847bdbb5b8828f3bb5ea09e (patch)
treedf302c6f53ee38db96aea1f6013692874c40b30a
parent22d00d80cee85219a2c6e489592b4d8b86c16bd4 (diff)
downloadredis-99c93f34a76fd7b64847bdbb5b8828f3bb5ea09e.tar.gz
Sentinel: remove useless sentinelFlushConfig() call
To rewrite the config in the loop that adds slaves back after a master reset, in order to handle switching to another master, is useless: it just adds latency since there is an fsync call in the inner loop, without providing any additional guarantee, but the contrary, since if after the first loop iteration the server crashes we end with just a single slave entry losing all the other informations. It is wiser to rewrite the config at the end when the full new state is configured.
-rw-r--r--src/sentinel.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/sentinel.c b/src/sentinel.c
index ae83996b6..8d1311f4b 100644
--- a/src/sentinel.c
+++ b/src/sentinel.c
@@ -1271,10 +1271,7 @@ int sentinelResetMasterAndChangeAddress(sentinelRedisInstance *master, char *ip,
slave = createSentinelRedisInstance(NULL,SRI_SLAVE,slaves[j]->ip,
slaves[j]->port, master->quorum, master);
releaseSentinelAddr(slaves[j]);
- if (slave) {
- sentinelEvent(REDIS_NOTICE,"+slave",slave,"%@");
- sentinelFlushConfig();
- }
+ if (slave) sentinelEvent(REDIS_NOTICE,"+slave",slave,"%@");
}
zfree(slaves);