fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-11 03:36:05 +00:00
Code Issues Projects Releases Wiki Activity

Sentinel: Notify user when config can't be saved

Browse Source
This commit is contained in:
Matt Stancliff 2014-03-14 17:07:52 -04:00
parent b47b343fab
commit 4290455145
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/sentinel.c
View File

@ -1562,19 +1562,22 @@ void rewriteConfigSentinelOption(struct rewriteConfigState *state) {
void sentinelFlushConfig(void) { void sentinelFlushConfig(void) {
int fd; int fd;
int saved_hz = server.hz; int saved_hz = server.hz;
int rewrite_status;
server.hz = REDIS_DEFAULT_HZ; server.hz = REDIS_DEFAULT_HZ;
if (rewriteConfig(server.configfile) != -1) { rewrite_status = rewriteConfig(server.configfile);
/* Rewrite succeded, fsync it. */
if ((fd = open(server.configfile,O_RDONLY)) != -1) {
fsync(fd);
close(fd);
}
} else {
redisLog(REDIS_WARNING,"WARNING: Sentinel was not able to save the new configuration on disk!!!: %s", strerror(errno));
}
server.hz = saved_hz; server.hz = saved_hz;
if (rewrite_status == -1) goto werr;
if ((fd = open(server.configfile,O_RDONLY)) == -1) goto werr;
if (fsync(fd) == -1) goto werr;
if (close(fd) == EOF) goto werr;
return; return;
werr:
if (fd != -1) close(fd);
redisLog(REDIS_WARNING,"WARNING: Sentinel was not able to save the new configuration on disk!!!: %s", strerror(errno));
} }
/* ====================== hiredis connection handling ======================= */ /* ====================== hiredis connection handling ======================= */