Skip to content

Set repl-backlog-size from 1mb to 10mb by default #911

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.

Sign up for GitHub

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

Merged
hwware merged 4 commits into from
Aug 21, 2024
Merged

Set repl-backlog-size from 1mb to 10mb by default #911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
20c2ff9
Set repl-backlog-size from 1mb to 10mb by default
enjoy-binbin Aug 14, 2024
5321b55
fix test issue, use 1MB in shutdown test
enjoy-binbin Aug 14, 2024
dd7cae1
fix test
enjoy-binbin Aug 14, 2024
cd1fd4d
fix test
enjoy-binbin Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3224,7 +3224,7 @@ standardConfig static_configs[] = {
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, DEBUG_CONFIG | MODIFIABLE_CONFIG, 1024 * 1024, 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, LLONG_MAX, server.stream_node_max_entries, 100, INTEGER_CONFIG, NULL, NULL),
createLongLongConfig("repl-backlog-size", NULL, MODIFIABLE_CONFIG, 1, LLONG_MAX, server.repl_backlog_size, 1024 * 1024, MEMORY_CONFIG, NULL, updateReplBacklogSize), /* Default: 1mb */
createLongLongConfig("repl-backlog-size", NULL, MODIFIABLE_CONFIG, 1, LLONG_MAX, server.repl_backlog_size, 10 * 1024 * 1024, MEMORY_CONFIG, NULL, updateReplBacklogSize), /* Default: 10mb */

/* Unsigned Long Long configs */
createULongLongConfig("maxmemory", NULL, MODIFIABLE_CONFIG, 0, ULLONG_MAX, server.maxmemory, 0, MEMORY_CONFIG, NULL, updateMaxmemory),
Expand Down
16 changes: 8 additions & 8 deletions tests/integration/shutdown.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ proc fill_up_os_socket_send_buffer_for_repl {idx} {

foreach how {sigterm shutdown} {
test "Shutting down master waits for replica to catch up ($how)" {
start_server {overrides {save ""}} {
start_server {overrides {save ""}} {
start_server {overrides {save "" repl-backlog-size 1MB}} {
start_server {overrides {save "" repl-backlog-size 1MB}} {
set master [srv -1 client]
set master_host [srv -1 host]
set master_port [srv -1 port]
Expand Down Expand Up @@ -85,8 +85,8 @@ foreach how {sigterm shutdown} {
}

test {Shutting down master waits for replica timeout} {
start_server {overrides {save ""}} {
start_server {overrides {save ""}} {
start_server {overrides {save "" repl-backlog-size 1MB}} {
start_server {overrides {save "" repl-backlog-size 1MB}} {
set master [srv -1 client]
set master_host [srv -1 host]
set master_port [srv -1 port]
Expand Down Expand Up @@ -134,8 +134,8 @@ test {Shutting down master waits for replica timeout} {
} {} {repl external:skip}

test "Shutting down master waits for replica then fails" {
start_server {overrides {save ""}} {
start_server {overrides {save ""}} {
start_server {overrides {save "" repl-backlog-size 1MB}} {
start_server {overrides {save "" repl-backlog-size 1MB}} {
set master [srv -1 client]
set master_host [srv -1 host]
set master_port [srv -1 port]
Expand Down Expand Up @@ -193,8 +193,8 @@ test "Shutting down master waits for replica then fails" {
} {} {repl external:skip}

test "Shutting down master waits for replica then aborted" {
start_server {overrides {save ""}} {
start_server {overrides {save ""}} {
start_server {overrides {save "" repl-backlog-size 1MB}} {
start_server {overrides {save "" repl-backlog-size 1MB}} {
set master [srv -1 client]
set master_host [srv -1 host]
set master_port [srv -1 port]
Expand Down
2 changes: 1 addition & 1 deletion valkey.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -734,7 +734,7 @@ repl-disable-tcp-nodelay no
#
# The backlog is only allocated if there is at least one replica connected.
#
# repl-backlog-size 1mb
# repl-backlog-size 10mb

# After a primary has no connected replicas for some time, the backlog will be
# freed. The following option configures the amount of seconds that need to
Expand Down