Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
e245a204
Commit
e245a204
authored
Aug 27, 2018
by
antirez
Browse files
Make slave-ignore-maxmemory configurable.
parent
067647a7
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/config.c
View file @
e245a204
...
@@ -399,6 +399,10 @@ void loadServerConfigFromString(char *config) {
...
@@ -399,6 +399,10 @@ void loadServerConfigFromString(char *config) {
if
((
server
.
repl_slave_ro
=
yesnotoi
(
argv
[
1
]))
==
-
1
)
{
if
((
server
.
repl_slave_ro
=
yesnotoi
(
argv
[
1
]))
==
-
1
)
{
err
=
"argument must be 'yes' or 'no'"
;
goto
loaderr
;
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
)
{
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"rdbcompression"
)
&&
argc
==
2
)
{
if
((
server
.
rdb_compression
=
yesnotoi
(
argv
[
1
]))
==
-
1
)
{
if
((
server
.
rdb_compression
=
yesnotoi
(
argv
[
1
]))
==
-
1
)
{
err
=
"argument must be 'yes' or 'no'"
;
goto
loaderr
;
err
=
"argument must be 'yes' or 'no'"
;
goto
loaderr
;
...
@@ -1047,6 +1051,8 @@ void configSetCommand(client *c) {
...
@@ -1047,6 +1051,8 @@ void configSetCommand(client *c) {
"slave-serve-stale-data"
,
server
.
repl_serve_stale_data
)
{
"slave-serve-stale-data"
,
server
.
repl_serve_stale_data
)
{
}
config_set_bool_field
(
}
config_set_bool_field
(
"slave-read-only"
,
server
.
repl_slave_ro
)
{
"slave-read-only"
,
server
.
repl_slave_ro
)
{
}
config_set_bool_field
(
"slave-ignore-maxmemory"
,
server
.
repl_slave_ignore_maxmemory
)
{
}
config_set_bool_field
(
}
config_set_bool_field
(
"activerehashing"
,
server
.
activerehashing
)
{
"activerehashing"
,
server
.
activerehashing
)
{
}
config_set_bool_field
(
}
config_set_bool_field
(
...
@@ -1353,6 +1359,8 @@ void configGetCommand(client *c) {
...
@@ -1353,6 +1359,8 @@ void configGetCommand(client *c) {
server
.
repl_serve_stale_data
);
server
.
repl_serve_stale_data
);
config_get_bool_field
(
"slave-read-only"
,
config_get_bool_field
(
"slave-read-only"
,
server
.
repl_slave_ro
);
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"
,
config_get_bool_field
(
"stop-writes-on-bgsave-error"
,
server
.
stop_writes_on_bgsave_err
);
server
.
stop_writes_on_bgsave_err
);
config_get_bool_field
(
"daemonize"
,
server
.
daemonize
);
config_get_bool_field
(
"daemonize"
,
server
.
daemonize
);
...
@@ -2049,6 +2057,7 @@ int rewriteConfig(char *path) {
...
@@ -2049,6 +2057,7 @@ int rewriteConfig(char *path) {
rewriteConfigStringOption
(
state
,
"cluster-announce-ip"
,
server
.
cluster_announce_ip
,
NULL
);
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-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-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-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
);
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
);
rewriteConfigBytesOption
(
state
,
"repl-backlog-size"
,
server
.
repl_backlog_size
,
CONFIG_DEFAULT_REPL_BACKLOG_SIZE
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment