Deprecate Redis Sentinel in 2.6.

Everybody should use the more robust implementation shipped with 2.8.
This commit is contained in:
antirez 2014-02-25 15:18:43 +01:00
parent 2fc65c844f
commit 51943a78b0
3 changed files with 10 additions and 3131 deletions

View File

@ -417,8 +417,6 @@ void loadServerConfigFromString(char *config) {
err = "sentinel directive while not in sentinel mode";
goto loaderr;
}
err = sentinelHandleConfiguration(argv+1,argc-1);
if (err) goto loaderr;
}
} else {
err = "Bad directive or wrong number of arguments"; goto loaderr;

View File

@ -1110,11 +1110,6 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) {
* to detect transfer failures. */
run_with_period(1000) replicationCron();
/* Run the sentinel timer if we are in sentinel mode. */
run_with_period(100) {
if (server.sentinel_mode) sentinelTimer();
}
server.cronloops++;
return 1000/server.hz;
}

File diff suppressed because it is too large Load Diff