From e68cee23a19a85ddcebe544d4a4a26d94235b49b Mon Sep 17 00:00:00 2001 From: christianEQ Date: Mon, 11 Jan 2021 21:38:15 +0000 Subject: [PATCH] added section to keydb.conf for new options, tweaked default Former-commit-id: 9b81f3f263de8cffab20ef4d20c2ac4935f63a10 --- keydb.conf | 7 +++++++ src/config.cpp | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/keydb.conf b/keydb.conf index 349135f93..bf2bfd922 100644 --- a/keydb.conf +++ b/keydb.conf @@ -1881,6 +1881,13 @@ jemalloc-bg-thread yes # Tuning this parameter is a tradeoff between locking overhead and distributing the workload over multiple cores # min-clients-per-thread 50 +# How often to run RDB load progress callback? +# The callback runs during key load to ping other servers and prevent timeouts. +# It also updates load time estimates. +# Change these values to run it more or less often. It will run when either condition is true. +# loading-process-events-interval-bytes 2097152 # Run when x bytes have been processed +# loading-process-events-interval-keys 8192 # Run when x keys have been loaded + # Avoid forwarding RREPLAY messages to other masters? # WARNING: This setting is dangerous! You must be certain all masters are connected to each # other in a true mesh topology or data loss will occur! diff --git a/src/config.cpp b/src/config.cpp index 55f43b207..39a76c6da 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -2467,7 +2467,7 @@ standardConfig configs[] = { /* Long configs */ createLongConfig("loading-process-events-interval-bytes", NULL, MODIFIABLE_CONFIG, 0, LONG_MAX, g_pserver->loading_process_events_interval_bytes, 2*1024*1024, MEMORY_CONFIG, NULL, NULL), - createLongConfig("loading-process-events-interval-keys", NULL, MODIFIABLE_CONFIG, 0, LONG_MAX, g_pserver->loading_process_events_interval_keys, 10000, MEMORY_CONFIG, NULL, NULL), + createLongConfig("loading-process-events-interval-keys", NULL, MODIFIABLE_CONFIG, 0, LONG_MAX, g_pserver->loading_process_events_interval_keys, 8192, MEMORY_CONFIG, NULL, NULL), /* Unsigned Long configs */ createULongConfig("active-defrag-max-scan-fields", NULL, MODIFIABLE_CONFIG, 1, LONG_MAX, cserver.active_defrag_max_scan_fields, 1000, INTEGER_CONFIG, NULL, NULL), /* Default: keys with more than 1000 fields will be processed separately */ createULongConfig("slowlog-max-len", NULL, MODIFIABLE_CONFIG, 0, LONG_MAX, g_pserver->slowlog_max_len, 128, INTEGER_CONFIG, NULL, NULL),