upstream/redis
1
0
Fork 0
mirror of https://github.com/redis/redis.git synced 2026-04-23 07:07:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge 98957f4f40 into e1d35aca01

Browse source
This commit is contained in:
Mincho Paskalev 2026-04-13 16:51:29 +09:00 committed by GitHub
commit b41404d69f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/config.c
View file

@ -2411,7 +2411,7 @@ static int isValidShutdownOnSigFlags(int val, const char **err) {
}
static int updateMemoryTrackingEnabled(const char **err) {
int memory_tracking_enabled = server.key_memory_histograms || clusterSlotStatsEnabled(CLUSTER_SLOT_STATS_MEM);
int memory_tracking_enabled = server.key_memory_histograms || (server.cluster_slot_stats_enabled & CLUSTER_SLOT_STATS_MEM);
if (!server.memory_tracking_enabled && memory_tracking_enabled) {
*err = "memory tracking cannot be enabled at runtime";
return 0;

21
tests/unit/cluster/slot-stats.tcl
View file

@ -158,7 +158,7 @@ proc wait_for_replica_key_exists {key key_count} {
# Test cases for CLUSTER SLOT-STATS cpu-usec metric correctness.
# -----------------------------------------------------------------------------
start_cluster 1 0 {tags {external:skip cluster} overrides {cluster-slot-stats-enabled yes}} {
start_cluster 1 0 {tags {external:skip cluster}} {
# Define shared variables.
set key "FOO"
@ -361,7 +361,7 @@ start_cluster 1 0 {tags {external:skip cluster} overrides {cluster-slot-stats-en
# Test cases for CLUSTER SLOT-STATS network-bytes-in.
# -----------------------------------------------------------------------------
start_cluster 1 0 {tags {external:skip cluster} overrides {cluster-slot-stats-enabled yes}} {
start_cluster 1 0 {tags {external:skip cluster}} {
# Define shared variables.
set key "key"
@ -471,7 +471,7 @@ start_cluster 1 0 {tags {external:skip cluster} overrides {cluster-slot-stats-en
R 0 FLUSHALL
}
start_cluster 1 1 {tags {external:skip cluster} overrides {cluster-slot-stats-enabled yes}} {
start_cluster 1 1 {tags {external:skip cluster}} {
set channel "channel"
set key_slot [R 0 cluster keyslot $channel]
set metrics_to_assert [list network-bytes-in]
@ -525,7 +525,6 @@ start_cluster 1 0 {tags {external:skip cluster}} {
set key_slot [R 0 cluster keyslot $key]
set expected_slots_to_key_count [dict create $key_slot 1]
set metrics_to_assert [list network-bytes-out]
R 0 CONFIG SET cluster-slot-stats-enabled yes
test "CLUSTER SLOT-STATS network-bytes-out, for non-slot specific commands." {
R 0 INFO
@ -583,7 +582,6 @@ start_cluster 1 1 {tags {external:skip cluster}} {
set key "FOO"
set key_slot [R 0 CLUSTER KEYSLOT $key]
set metrics_to_assert [list network-bytes-out]
R 0 CONFIG SET cluster-slot-stats-enabled yes
# Setup replication.
assert {[s -1 role] eq {slave}}
@ -616,7 +614,6 @@ start_cluster 1 1 {tags {external:skip cluster}} {
set channel_secondary "channel2"
set key_slot_secondary [R 0 cluster keyslot $channel_secondary]
set metrics_to_assert [list network-bytes-out]
R 0 CONFIG SET cluster-slot-stats-enabled yes
test "CLUSTER SLOT-STATS network-bytes-out, sharded pub/sub, single channel." {
set slot [R 0 cluster keyslot $channel]
@ -700,7 +697,7 @@ start_cluster 1 1 {tags {external:skip cluster}} {
# Test cases for CLUSTER SLOT-STATS key-count metric correctness.
# -----------------------------------------------------------------------------
start_cluster 1 0 {tags {external:skip cluster} overrides {cluster-slot-stats-enabled yes}} {
start_cluster 1 0 {tags {external:skip cluster}} {
# Define shared variables.
set key "FOO"
@ -785,7 +782,7 @@ start_cluster 1 0 {tags {external:skip cluster}} {
# Test cases for CLUSTER SLOT-STATS ORDERBY sub-argument.
# -----------------------------------------------------------------------------
start_cluster 1 0 {tags {external:skip cluster} overrides {cluster-slot-stats-enabled yes}} {
start_cluster 1 0 {tags {external:skip cluster}} {
set metrics [list "key-count" "memory-bytes" "cpu-usec" "network-bytes-in" "network-bytes-out"]
@ -891,7 +888,7 @@ start_cluster 1 0 {tags {external:skip cluster} overrides {cluster-slot-stats-en
# Test cases for CLUSTER SLOT-STATS replication.
# -----------------------------------------------------------------------------
start_cluster 1 1 {tags {external:skip cluster} overrides {cluster-slot-stats-enabled yes}} {
start_cluster 1 1 {tags {external:skip cluster}} {
# Define shared variables.
set key "key"
@ -994,7 +991,7 @@ start_cluster 1 1 {tags {external:skip cluster} overrides {cluster-slot-stats-en
R 1 CONFIG RESETSTAT
}
start_cluster 2 2 {tags {external:skip cluster} overrides {cluster-slot-stats-enabled yes}} {
start_cluster 2 2 {tags {external:skip cluster}} {
test "CLUSTER SLOT-STATS reset upon atomic slot migration" {
# key on slot-0
set key0 "{06S}mykey0"
@ -1044,7 +1041,7 @@ start_cluster 2 2 {tags {external:skip cluster} overrides {cluster-slot-stats-en
# Test cases for CLUSTER SLOT-STATS memory-bytes field presence.
# -----------------------------------------------------------------------------
start_cluster 1 0 {tags {external:skip cluster} overrides {cluster-slot-stats-enabled yes}} {
start_cluster 1 0 {tags {external:skip cluster}} {
# Define shared variables.
set key "FOO"
set key_slot [R 0 cluster keyslot $key]
@ -1174,7 +1171,7 @@ start_cluster 1 0 {tags {external:skip cluster} overrides {cluster-slot-stats-en
# may change object encoding (e.g., listTypeTryConversion).
# -----------------------------------------------------------------------------
start_cluster 1 0 {tags {external:skip cluster needs:debug} overrides {cluster-slot-stats-enabled yes}} {
start_cluster 1 0 {tags {external:skip cluster needs:debug}} {
# Enable debug assertion that validates memory tracking after each command.
# This will cause a panic if tracked memory doesn't match actual memory.
R 0 DEBUG ALLOCSIZE-SLOTS-ASSERT 1