From 247c916f696cb9b4217c48c9edf6eecad98cbd3a Mon Sep 17 00:00:00 2001 From: christianEQ Date: Thu, 14 Jan 2021 18:43:35 +0000 Subject: [PATCH] changed loading process config types to be consistent across environments Former-commit-id: d2867580aba70bbfa703578cdb40093a4e1a7147 --- src/config.cpp | 5 ++--- src/server.h | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/config.cpp b/src/config.cpp index 39a76c6da..66fc8afeb 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -2464,11 +2464,10 @@ standardConfig configs[] = { createIntConfig("replica-quorum", NULL, MODIFIABLE_CONFIG, -1, INT_MAX, g_pserver->repl_quorum, -1, INTEGER_CONFIG, NULL, NULL), /* Unsigned int configs */ createUIntConfig("maxclients", NULL, MODIFIABLE_CONFIG, 1, UINT_MAX, g_pserver->maxclients, 10000, INTEGER_CONFIG, NULL, updateMaxclients), + createUIntConfig("loading-process-events-interval-keys", NULL, MODIFIABLE_CONFIG, 0, LONG_MAX, g_pserver->loading_process_events_interval_keys, 8192, MEMORY_CONFIG, NULL, NULL), - /* 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, 8192, MEMORY_CONFIG, NULL, NULL), /* Unsigned Long configs */ + createULongConfig("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), 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), createULongConfig("acllog-max-len", NULL, MODIFIABLE_CONFIG, 0, LONG_MAX, g_pserver->acllog_max_len, 128, INTEGER_CONFIG, NULL, NULL), diff --git a/src/server.h b/src/server.h index 0bd19b4aa..7eafb444f 100644 --- a/src/server.h +++ b/src/server.h @@ -1514,8 +1514,8 @@ struct redisServer { off_t loading_total_bytes; off_t loading_loaded_bytes; time_t loading_start_time; - off_t loading_process_events_interval_bytes; - off_t loading_process_events_interval_keys; + unsigned long loading_process_events_interval_bytes; + unsigned int loading_process_events_interval_keys; int active_expire_enabled; /* Can be disabled for testing purposes. */