slipenkomk/valkey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix replica node cannot expand dicts when loading legacy RDB (#12839)

Browse Source 
When loading RDB on cluster nodes, it is necessary to consider the
scenario where a node is a replica.

For example, during a rolling upgrade, new version instances are often
mounted as replicas on old version instances. In this case, the full
synchronization legacy RDB does not contain slot information, and the
new version instance, acting as a replica, should be able to handle the
legacy RDB correctly for `dbExpand`.

Additionally, renaming `getMyClusterSlotCount` to `getMyShardSlotCount`
would be appropriate.

Introduced in #11695
This commit is contained in:
zhaozhao.zz 2023-12-07 14:30:48 +08:00 committed by GitHub
parent e2a3f3091f
commit 8e11f84ded
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cluster.h
View File

@ -80,7 +80,7 @@ int clusterNodeIsMyself(clusterNode *n);
clusterNode *getMyClusterNode(void);
char *getMyClusterId(void);
int getClusterSize(void);
int getMyClusterSlotCount(void);
int getMyShardSlotCount(void);
int handleDebugClusterCommand(client *c);
int clusterNodePending(clusterNode *node);
int clusterNodeIsMaster(clusterNode *n);

10
src/cluster_legacy.c
View File

@ -5781,8 +5781,14 @@ int getClusterSize(void) {
return dictSize(server.cluster->nodes);
}
int getMyClusterSlotCount(void) {
return server.cluster->myself->numslots;
int getMyShardSlotCount(void) {
if (!nodeIsSlave(server.cluster->myself)) {
return server.cluster->myself->numslots;
} else if (server.cluster->myself->slaveof) {
return server.cluster->myself->slaveof->numslots;
} else {
return 0;
}
}
char **getClusterNodesList(size_t *numnodes) {

2
src/db.c
View File

@ -2215,7 +2215,7 @@ int dbExpand(const redisDb *db, uint64_t db_size, dbKeyType keyType, int try_exp
if (server.cluster_enabled) {
/* We don't know exact number of keys that would fall into each slot, but we can
* approximate it, assuming even distribution, divide it by the number of slots. */
int slots = getMyClusterSlotCount();
int slots = getMyShardSlotCount();
if (slots == 0) return C_OK;
db_size = db_size / slots;