Merge pull request #5322 from youjiali1995/fix-sentinel-randomize

sentinel: fix randomized sentinelTimer.
This commit is contained in:
Salvatore Sanfilippo 2018-09-07 12:10:35 +02:00 committed by GitHub
commit a62b8410ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1320,9 +1320,7 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) {
}
/* Run the Sentinel timer if we are in sentinel mode. */
run_with_period(100) {
if (server.sentinel_mode) sentinelTimer();
}
if (server.sentinel_mode) sentinelTimer();
/* Cleanup expired MIGRATE cached sockets. */
run_with_period(1000) {