Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding set repl-syncio-timeout in config command #886

Closed
wants to merge 2 commits into from
Closed

Adding set repl-syncio-timeout in config command #886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cda108c
prohibit to run freeMemoryIfNeed when it is slave
charsyam Jan 15, 2013
9995b03
add repl-syncio-timeout with config set/get
charsyam Jan 16, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/config.c
View file
Open in desktop
Expand Up @@ -230,6 +230,12 @@ void loadServerConfigFromString(char *config) {
err = "repl-timeout must be 1 or greater";
goto loaderr;
}
} else if (!strcasecmp(argv[0],"repl-syncio-timeout") && argc == 2) {
server.repl_syncio_timeout = atoi(argv[1]);
if (server.repl_syncio_timeout <= 0) {
err = "repl-syncio-timeout must be 1 or greater";
goto loaderr;
}
} else if (!strcasecmp(argv[0],"masterauth") && argc == 2) {
server.masterauth = zstrdup(argv[1]);
} else if (!strcasecmp(argv[0],"slave-serve-stale-data") && argc == 2) {
Expand Down Expand Up @@ -698,6 +704,9 @@ void configSetCommand(redisClient *c) {
} else if (!strcasecmp(c->argv[2]->ptr,"repl-timeout")) {
if (getLongLongFromObject(o,&ll) == REDIS_ERR || ll <= 0) goto badfmt;
server.repl_timeout = ll;
} else if (!strcasecmp(c->argv[2]->ptr,"repl-syncio-timeout")) {
if (getLongLongFromObject(o,&ll) == REDIS_ERR || ll <= 0) goto badfmt;
server.repl_syncio_timeout = ll;
} else if (!strcasecmp(c->argv[2]->ptr,"watchdog-period")) {
if (getLongLongFromObject(o,&ll) == REDIS_ERR || ll < 0) goto badfmt;
if (ll)
Expand Down Expand Up @@ -805,6 +814,7 @@ void configGetCommand(redisClient *c) {
config_get_numerical_field("databases",server.dbnum);
config_get_numerical_field("repl-ping-slave-period",server.repl_ping_slave_period);
config_get_numerical_field("repl-timeout",server.repl_timeout);
config_get_numerical_field("repl-syncio-timeout",server.repl_syncio_timeout);
config_get_numerical_field("maxclients",server.maxclients);
config_get_numerical_field("watchdog-period",server.watchdog_period);
config_get_numerical_field("slave-priority",server.slave_priority);
Expand Down
2 changes: 2 additions & 0 deletions src/redis.c
View file
Open in desktop
Expand Up @@ -2304,6 +2304,8 @@ void monitorCommand(redisClient *c) {
* used by the server.
*/
int freeMemoryIfNeeded(void) {
if (server.masterhost) return REDIS_OK;

size_t mem_used, mem_tofree, mem_freed;
int slaves = listLength(server.slaves);

Expand Down