From 114df2728f9271c6aad5433d2e340ad5289bf109 Mon Sep 17 00:00:00 2001 From: adzfolc Date: Tue, 6 Feb 2024 16:11:06 +0800 Subject: [PATCH] [feat] 1. limit master expire key max cpu --- src/config.c | 2 +- src/expire.c | 2 +- src/server.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/config.c b/src/config.c index 402696a9cd6..888c43667de 100644 --- a/src/config.c +++ b/src/config.c @@ -2978,7 +2978,7 @@ standardConfig configs[] = { createIntConfig("rdb-key-save-delay", NULL, MODIFIABLE_CONFIG, INT_MIN, INT_MAX, server.rdb_key_save_delay, 0, INTEGER_CONFIG, NULL, NULL), createIntConfig("key-load-delay", NULL, MODIFIABLE_CONFIG, INT_MIN, INT_MAX, server.key_load_delay, 0, INTEGER_CONFIG, NULL, NULL), createIntConfig("active-expire-effort", NULL, MODIFIABLE_CONFIG, 1, 10, server.active_expire_effort, 1, INTEGER_CONFIG, NULL, NULL), /* From 1 to 10. */ - createIntConfig("slow-expire-effort", NULL, MODIFIABLE_CONFIG, -10, 10, server.slow_expire_effort, -5, INTEGER_CONFIG, NULL, NULL), + createIntConfig("swap-slow-expire-effort", NULL, MODIFIABLE_CONFIG, -10, 10, server.swap_slow_expire_effort, -5, INTEGER_CONFIG, NULL, NULL), createIntConfig("hz", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, server.config_hz, CONFIG_DEFAULT_HZ, INTEGER_CONFIG, NULL, updateHZ), createIntConfig("min-replicas-to-write", "min-slaves-to-write", MODIFIABLE_CONFIG, 0, INT_MAX, server.repl_min_slaves_to_write, 0, INTEGER_CONFIG, NULL, updateGoodSlaves), createIntConfig("min-replicas-max-lag", "min-slaves-max-lag", MODIFIABLE_CONFIG, 0, INT_MAX, server.repl_min_slaves_max_lag, 10, INTEGER_CONFIG, NULL, updateGoodSlaves), diff --git a/src/expire.c b/src/expire.c index 2e8a43f9858..cdb2483d310 100644 --- a/src/expire.c +++ b/src/expire.c @@ -141,7 +141,7 @@ void activeExpireCycle(int type) { config_cycle_fast_duration = ACTIVE_EXPIRE_CYCLE_FAST_DURATION + ACTIVE_EXPIRE_CYCLE_FAST_DURATION/4*effort, config_cycle_slow_time_perc = ACTIVE_EXPIRE_CYCLE_SLOW_TIME_PERC + - 2*server.slow_expire_effort, + 2*server.swap_slow_expire_effort, config_cycle_acceptable_stale = ACTIVE_EXPIRE_CYCLE_ACCEPTABLE_STALE- effort; diff --git a/src/server.h b/src/server.h index 2c369922346..9d12fb1610e 100644 --- a/src/server.h +++ b/src/server.h @@ -1415,7 +1415,7 @@ struct redisServer { int tcpkeepalive; /* Set SO_KEEPALIVE if non-zero. */ int active_expire_enabled; /* Can be disabled for testing purposes. */ int active_expire_effort; /* From 1 (default) to 10, active effort. */ - int slow_expire_effort; /* From -10 to 10, default -5, slow expire effort */ + int swap_slow_expire_effort; /* From -10 to 10, default -5, swap slow expire effort */ int active_defrag_enabled; int sanitize_dump_payload; /* Enables deep sanitization for ziplist and listpack in RDB and RESTORE. */ int skip_checksum_validation; /* Disables checksum validateion for RDB and RESTORE payload. */