mirrors/valkey
1
0
Fork 0
mirror of http://github.com/valkey-io/valkey synced 2024-11-21 16:46:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make sure clear the CLUSTER SLOTS cache on time when updating hostname (#564)

Browse Source 
In #53, we will cache the CLUSTER SLOTS response to improve the
throughput and reduct the latency.

In the code snippet below, the second cluster slots will use the
old hostname:
```
config set cluster-preferred-endpoint-type hostname
config set cluster-announce-hostname old-hostname.com
multi
cluster slots
config set cluster-announce-hostname new-hostname.com
cluster slots
exec
```

When updating the hostname, in updateAnnouncedHostname, we will set
CLUSTER_TODO_SAVE_CONFIG and we will do a clearCachedClusterSlotsResponse
in clusterSaveConfigOrDie, so harmless in most cases.

Move the clearCachedClusterSlotsResponse call to clusterDoBeforeSleep
instead of scheduling it to be called in clusterSaveConfigOrDie.

Signed-off-by: Binbin <binloveplay1314@qq.com>
This commit is contained in:
Binbin 2024-05-30 10:44:12 +08:00 committed by GitHub
parent 168da8b52e
commit 6bab2d7968
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cluster_legacy.c
View File

@ -752,7 +752,6 @@ void clusterSaveConfigOrDie(int do_fsync) {
serverLog(LL_WARNING, "Fatal: can't update cluster config file.");
exit(1);
}
clearCachedClusterSlotsResponse();
}
/* Lock the cluster config using flock(), and retain the file descriptor used to
@ -4847,6 +4846,9 @@ void clusterBeforeSleep(void) {
}
void clusterDoBeforeSleep(int flags) {
/* Clear the cache if there are config changes here. */
if (flags & CLUSTER_TODO_SAVE_CONFIG) clearCachedClusterSlotsResponse();
server.cluster->todo_before_sleep |= flags;
}

14
tests/unit/cluster/hostnames.tcl
View File

@ -73,6 +73,20 @@ test "Verify cluster-preferred-endpoint-type behavior for redirects and info" {
# Verify prefer hostname behavior
R 0 config set cluster-preferred-endpoint-type hostname
# Make sure the cache is cleared when updating hostname.
R 0 multi
R 0 cluster slots
R 0 config set cluster-announce-hostname "new-me.com"
R 0 cluster slots
set multi_result [R 0 exec]
set slot_result1 [lindex $multi_result 0]
set slot_result2 [lindex $multi_result 2]
assert_equal "me.com" [get_slot_field $slot_result1 0 2 0]
assert_equal "new-me.com" [get_slot_field $slot_result2 0 2 0]
# Set it back to its original value.
R 0 config set cluster-announce-hostname "me.com"
set slot_result [R 0 cluster slots]
assert_equal "me.com" [get_slot_field $slot_result 0 2 0]
assert_equal "them.com" [get_slot_field $slot_result 2 2 0]