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
1bae5dff
Unverified
Commit
1bae5dff
authored
Dec 29, 2019
by
Salvatore Sanfilippo
Committed by
GitHub
Dec 29, 2019
Browse files
Merge pull request #6707 from oranagra/fix_config_limits
config.c adjust config limits and mutable
parents
324e22ac
0c3fe52e
Changes
2
Show whitespace changes
Inline
Side-by-side
src/config.c
View file @
1bae5dff
...
...
@@ -2137,7 +2137,7 @@ standardConfig configs[] = {
createBoolConfig
(
"rdbchecksum"
,
NULL
,
IMMUTABLE_CONFIG
,
server
.
rdb_checksum
,
1
,
NULL
,
NULL
),
createBoolConfig
(
"daemonize"
,
NULL
,
IMMUTABLE_CONFIG
,
server
.
daemonize
,
0
,
NULL
,
NULL
),
createBoolConfig
(
"io-threads-do-reads"
,
NULL
,
IMMUTABLE_CONFIG
,
server
.
io_threads_do_reads
,
0
,
NULL
,
NULL
),
/* Read + parse from threads? */
createBoolConfig
(
"lua-replicate-commands"
,
NULL
,
IMMUT
ABLE_CONFIG
,
server
.
lua_always_replicate_commands
,
1
,
NULL
,
NULL
),
createBoolConfig
(
"lua-replicate-commands"
,
NULL
,
MODIFI
ABLE_CONFIG
,
server
.
lua_always_replicate_commands
,
1
,
NULL
,
NULL
),
createBoolConfig
(
"always-show-logo"
,
NULL
,
IMMUTABLE_CONFIG
,
server
.
always_show_logo
,
0
,
NULL
,
NULL
),
createBoolConfig
(
"protected-mode"
,
NULL
,
MODIFIABLE_CONFIG
,
server
.
protected_mode
,
1
,
NULL
,
NULL
),
createBoolConfig
(
"rdbcompression"
,
NULL
,
MODIFIABLE_CONFIG
,
server
.
rdb_compression
,
1
,
NULL
,
NULL
),
...
...
@@ -2209,7 +2209,7 @@ standardConfig configs[] = {
createIntConfig
(
"maxmemory-samples"
,
NULL
,
MODIFIABLE_CONFIG
,
1
,
INT_MAX
,
server
.
maxmemory_samples
,
5
,
INTEGER_CONFIG
,
NULL
,
NULL
),
createIntConfig
(
"timeout"
,
NULL
,
MODIFIABLE_CONFIG
,
0
,
INT_MAX
,
server
.
maxidletime
,
0
,
INTEGER_CONFIG
,
NULL
,
NULL
),
/* Default client timeout: infinite */
createIntConfig
(
"replica-announce-port"
,
"slave-announce-port"
,
MODIFIABLE_CONFIG
,
0
,
65535
,
server
.
slave_announce_port
,
0
,
INTEGER_CONFIG
,
NULL
,
NULL
),
createIntConfig
(
"tcp-backlog"
,
NULL
,
MODIFI
ABLE_CONFIG
,
0
,
INT_MAX
,
server
.
tcp_backlog
,
511
,
INTEGER_CONFIG
,
NULL
,
NULL
),
/* TCP listen backlog. */
createIntConfig
(
"tcp-backlog"
,
NULL
,
IMMUT
ABLE_CONFIG
,
0
,
INT_MAX
,
server
.
tcp_backlog
,
511
,
INTEGER_CONFIG
,
NULL
,
NULL
),
/* TCP listen backlog. */
createIntConfig
(
"cluster-announce-bus-port"
,
NULL
,
MODIFIABLE_CONFIG
,
0
,
65535
,
server
.
cluster_announce_bus_port
,
0
,
INTEGER_CONFIG
,
NULL
,
NULL
),
/* Default: Use +10000 offset. */
createIntConfig
(
"cluster-announce-port"
,
NULL
,
MODIFIABLE_CONFIG
,
0
,
65535
,
server
.
cluster_announce_port
,
0
,
INTEGER_CONFIG
,
NULL
,
NULL
),
/* Use server.port */
createIntConfig
(
"repl-timeout"
,
NULL
,
MODIFIABLE_CONFIG
,
1
,
INT_MAX
,
server
.
repl_timeout
,
60
,
INTEGER_CONFIG
,
NULL
,
NULL
),
...
...
@@ -2235,9 +2235,9 @@ standardConfig configs[] = {
createLongLongConfig
(
"cluster-node-timeout"
,
NULL
,
MODIFIABLE_CONFIG
,
0
,
LLONG_MAX
,
server
.
cluster_node_timeout
,
15000
,
INTEGER_CONFIG
,
NULL
,
NULL
),
createLongLongConfig
(
"slowlog-log-slower-than"
,
NULL
,
MODIFIABLE_CONFIG
,
-
1
,
LLONG_MAX
,
server
.
slowlog_log_slower_than
,
10000
,
INTEGER_CONFIG
,
NULL
,
NULL
),
createLongLongConfig
(
"latency-monitor-threshold"
,
NULL
,
MODIFIABLE_CONFIG
,
0
,
LLONG_MAX
,
server
.
latency_monitor_threshold
,
0
,
INTEGER_CONFIG
,
NULL
,
NULL
),
createLongLongConfig
(
"proto-max-bulk-len"
,
NULL
,
MODIFIABLE_CONFIG
,
0
,
LONG_MAX
,
server
.
proto_max_bulk_len
,
512ll
*
1024
*
1024
,
MEMORY_CONFIG
,
NULL
,
NULL
),
/* Bulk request max size */
createLongLongConfig
(
"stream-node-max-entries"
,
NULL
,
MODIFIABLE_CONFIG
,
0
,
LONG_MAX
,
server
.
stream_node_max_entries
,
100
,
INTEGER_CONFIG
,
NULL
,
NULL
),
createLongLongConfig
(
"repl-backlog-size"
,
NULL
,
MODIFIABLE_CONFIG
,
1
,
LONG_MAX
,
server
.
repl_backlog_size
,
1024
*
1024
,
MEMORY_CONFIG
,
NULL
,
updateReplBacklogSize
),
/* Default: 1mb */
createLongLongConfig
(
"proto-max-bulk-len"
,
NULL
,
MODIFIABLE_CONFIG
,
0
,
L
LONG_MAX
,
server
.
proto_max_bulk_len
,
512ll
*
1024
*
1024
,
MEMORY_CONFIG
,
NULL
,
NULL
),
/* Bulk request max size */
createLongLongConfig
(
"stream-node-max-entries"
,
NULL
,
MODIFIABLE_CONFIG
,
0
,
L
LONG_MAX
,
server
.
stream_node_max_entries
,
100
,
INTEGER_CONFIG
,
NULL
,
NULL
),
createLongLongConfig
(
"repl-backlog-size"
,
NULL
,
MODIFIABLE_CONFIG
,
1
,
L
LONG_MAX
,
server
.
repl_backlog_size
,
1024
*
1024
,
MEMORY_CONFIG
,
NULL
,
updateReplBacklogSize
),
/* Default: 1mb */
/* Unsigned Long Long configs */
createULongLongConfig
(
"maxmemory"
,
NULL
,
MODIFIABLE_CONFIG
,
0
,
ULLONG_MAX
,
server
.
maxmemory
,
0
,
MEMORY_CONFIG
,
NULL
,
updateMaxmemory
),
...
...
@@ -2246,7 +2246,7 @@ standardConfig configs[] = {
createSizeTConfig
(
"hash-max-ziplist-entries"
,
NULL
,
MODIFIABLE_CONFIG
,
0
,
LONG_MAX
,
server
.
hash_max_ziplist_entries
,
512
,
INTEGER_CONFIG
,
NULL
,
NULL
),
createSizeTConfig
(
"set-max-intset-entries"
,
NULL
,
MODIFIABLE_CONFIG
,
0
,
LONG_MAX
,
server
.
set_max_intset_entries
,
512
,
INTEGER_CONFIG
,
NULL
,
NULL
),
createSizeTConfig
(
"zset-max-ziplist-entries"
,
NULL
,
MODIFIABLE_CONFIG
,
0
,
LONG_MAX
,
server
.
zset_max_ziplist_entries
,
128
,
INTEGER_CONFIG
,
NULL
,
NULL
),
createSizeTConfig
(
"active-defrag-ignore-bytes"
,
NULL
,
MODIFIABLE_CONFIG
,
1
,
LONG_MAX
,
server
.
active_defrag_ignore_bytes
,
100
<<
20
,
MEMORY_CONFIG
,
NULL
,
NULL
),
/* Default: don't defrag if frag overhead is below 100mb */
createSizeTConfig
(
"active-defrag-ignore-bytes"
,
NULL
,
MODIFIABLE_CONFIG
,
1
,
L
LONG_MAX
,
server
.
active_defrag_ignore_bytes
,
100
<<
20
,
MEMORY_CONFIG
,
NULL
,
NULL
),
/* Default: don't defrag if frag overhead is below 100mb */
createSizeTConfig
(
"hash-max-ziplist-value"
,
NULL
,
MODIFIABLE_CONFIG
,
0
,
LONG_MAX
,
server
.
hash_max_ziplist_value
,
64
,
MEMORY_CONFIG
,
NULL
,
NULL
),
createSizeTConfig
(
"stream-node-max-bytes"
,
NULL
,
MODIFIABLE_CONFIG
,
0
,
LONG_MAX
,
server
.
stream_node_max_bytes
,
4096
,
MEMORY_CONFIG
,
NULL
,
NULL
),
createSizeTConfig
(
"zset-max-ziplist-value"
,
NULL
,
MODIFIABLE_CONFIG
,
0
,
LONG_MAX
,
server
.
zset_max_ziplist_value
,
64
,
MEMORY_CONFIG
,
NULL
,
NULL
),
...
...
tests/unit/introspection.tcl
View file @
1bae5dff
...
...
@@ -65,7 +65,7 @@ start_server {tags {"introspection"}} {
rdbchecksum
daemonize
io-threads-do-reads
lua-replicate-commands
tcp-backlog
always-show-logo
syslog-enabled
cluster-enabled
...
...
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