mirror of
https://github.com/fluencelabs/redis
synced 2025-04-02 07:41:04 +00:00
Sentinel: sentinelFlushConfig() to CONFIG REWRITE + fsync.
This commit is contained in:
parent
5998769c28
commit
e257ab2bfe
@ -1171,6 +1171,7 @@ void appendServerSaveParams(time_t seconds, int changes);
|
|||||||
void resetServerSaveParams();
|
void resetServerSaveParams();
|
||||||
struct rewriteConfigState; /* Forward declaration to export API. */
|
struct rewriteConfigState; /* Forward declaration to export API. */
|
||||||
void rewriteConfigRewriteLine(struct rewriteConfigState *state, char *option, sds line, int force);
|
void rewriteConfigRewriteLine(struct rewriteConfigState *state, char *option, sds line, int force);
|
||||||
|
int rewriteConfig(char *path);
|
||||||
|
|
||||||
/* db.c -- Keyspace access API */
|
/* db.c -- Keyspace access API */
|
||||||
int removeExpire(redisDb *db, robj *key);
|
int removeExpire(redisDb *db, robj *key);
|
||||||
|
@ -36,6 +36,7 @@
|
|||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
#include <sys/wait.h>
|
#include <sys/wait.h>
|
||||||
|
#include <fcntl.h>
|
||||||
|
|
||||||
extern char **environ;
|
extern char **environ;
|
||||||
|
|
||||||
@ -1432,6 +1433,27 @@ void rewriteConfigSentinelOption(struct rewriteConfigState *state) {
|
|||||||
dictReleaseIterator(di);
|
dictReleaseIterator(di);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* This function uses the config rewriting Redis engine in order to persist
|
||||||
|
* the state of the Sentinel in the current configuration file.
|
||||||
|
*
|
||||||
|
* Before returning the function calls fsync() against the generated
|
||||||
|
* configuration file to make sure changes are committed to disk.
|
||||||
|
*
|
||||||
|
* On failure the function logs a warning on the Redis log. */
|
||||||
|
void sentinelFlushConfig(void) {
|
||||||
|
int fd;
|
||||||
|
|
||||||
|
if (rewriteConfig(server.configfile) == -1) {
|
||||||
|
redisLog(REDIS_WARNING,"WARNING: Senitnel was not able to save the new configuration on disk!!!: %s", strerror(errno));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if ((fd = open(server.configfile,O_RDONLY)) != -1) {
|
||||||
|
fsync(fd);
|
||||||
|
close(fd);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
/* ====================== hiredis connection handling ======================= */
|
/* ====================== hiredis connection handling ======================= */
|
||||||
|
|
||||||
/* Completely disconnect an hiredis link from an instance. */
|
/* Completely disconnect an hiredis link from an instance. */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user