diff options
author | antirez <antirez@gmail.com> | 2018-08-27 12:27:17 +0200 |
---|---|---|
committer | antirez <antirez@gmail.com> | 2018-08-27 12:27:17 +0200 |
commit | e245a2046af680a18f74cb76c2a23f5711149501 (patch) | |
tree | f1fadcbfa65def3c77bb3bd5e3b079da72e03602 | |
parent | 067647a78315cfa81bf489128afd6f4ae1388603 (diff) | |
download | redis-e245a2046af680a18f74cb76c2a23f5711149501.tar.gz |
Make slave-ignore-maxmemory configurable.
-rw-r--r-- | src/config.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/config.c b/src/config.c index b15cb6d77..1a64d25ed 100644 --- a/src/config.c +++ b/src/config.c @@ -399,6 +399,10 @@ void loadServerConfigFromString(char *config) { if ((server.repl_slave_ro = yesnotoi(argv[1])) == -1) { err = "argument must be 'yes' or 'no'"; goto loaderr; } + } else if (!strcasecmp(argv[0],"slave-ignore-maxmemory") && argc == 2) { + if ((server.repl_slave_ignore_maxmemory = yesnotoi(argv[1])) == -1) { + err = "argument must be 'yes' or 'no'"; goto loaderr; + } } else if (!strcasecmp(argv[0],"rdbcompression") && argc == 2) { if ((server.rdb_compression = yesnotoi(argv[1])) == -1) { err = "argument must be 'yes' or 'no'"; goto loaderr; @@ -1048,6 +1052,8 @@ void configSetCommand(client *c) { } config_set_bool_field( "slave-read-only",server.repl_slave_ro) { } config_set_bool_field( + "slave-ignore-maxmemory",server.repl_slave_ignore_maxmemory) { + } config_set_bool_field( "activerehashing",server.activerehashing) { } config_set_bool_field( "activedefrag",server.active_defrag_enabled) { @@ -1353,6 +1359,8 @@ void configGetCommand(client *c) { server.repl_serve_stale_data); config_get_bool_field("slave-read-only", server.repl_slave_ro); + config_get_bool_field("slave-ignore-maxmemory", + server.repl_slave_ignore_maxmemory); config_get_bool_field("stop-writes-on-bgsave-error", server.stop_writes_on_bgsave_err); config_get_bool_field("daemonize", server.daemonize); @@ -2049,6 +2057,7 @@ int rewriteConfig(char *path) { rewriteConfigStringOption(state,"cluster-announce-ip",server.cluster_announce_ip,NULL); rewriteConfigYesNoOption(state,"slave-serve-stale-data",server.repl_serve_stale_data,CONFIG_DEFAULT_SLAVE_SERVE_STALE_DATA); rewriteConfigYesNoOption(state,"slave-read-only",server.repl_slave_ro,CONFIG_DEFAULT_SLAVE_READ_ONLY); + rewriteConfigYesNoOption(state,"slave-ignore-maxmemory",server.repl_slave_ignore_maxmemory,CONFIG_DEFAULT_SLAVE_IGNORE_MAXMEMORY); rewriteConfigNumericalOption(state,"repl-ping-slave-period",server.repl_ping_slave_period,CONFIG_DEFAULT_REPL_PING_SLAVE_PERIOD); rewriteConfigNumericalOption(state,"repl-timeout",server.repl_timeout,CONFIG_DEFAULT_REPL_TIMEOUT); rewriteConfigBytesOption(state,"repl-backlog-size",server.repl_backlog_size,CONFIG_DEFAULT_REPL_BACKLOG_SIZE); |