Skip to content

Dictionary Implementation for Migrating and Importing slots #2409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 5, 2025
Merged

Dictionary Implementation for Migrating and Importing slots #2409

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
19cdf80
dictionary impl for migrating and importing slots
sarthakaggarwal97 Aug 1, 2025
b4cb81c
addressing comments
sarthakaggarwal97 Aug 4, 2025
536d139
pointers comparison
sarthakaggarwal97 Aug 4, 2025
922ffc9
replacing long with intptr_t
sarthakaggarwal97 Aug 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/cluster.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1094,9 +1094,9 @@ clusterNode *getNodeByQuery(client *c, int *error_code) {
* error). To do so we set the importing/migrating state and
* increment a counter for every missing key. */
if (clusterNodeIsPrimary(myself) || c->flag.readonly) {
if (n == clusterNodeGetPrimary(myself) && getMigratingSlotDest(c->slot) != NULL) {
if (n == clusterNodeGetPrimary(myself) && getMigratingSlot(c->slot) != NULL) {
migrating_slot = 1;
} else if (getImportingSlotSource(c->slot) != NULL) {
} else if (getImportingSlot(c->slot) != NULL) {
importing_slot = 1;
}
}
Expand Down Expand Up @@ -1260,7 +1260,7 @@ clusterNode *getNodeByQuery(client *c, int *error_code) {
return NULL;
} else {
if (error_code) *error_code = CLUSTER_REDIR_ASK;
return getMigratingSlotDest(c->slot);
return getMigratingSlot(c->slot);
}
}

Expand Down Expand Up @@ -1374,7 +1374,7 @@ int clusterRedirectBlockedClientIfNeeded(client *c) {
/* We send an error and unblock the client if:
* 1) The slot is unassigned, emitting a cluster down error.
* 2) The slot is neither handled by this node, nor being imported. */
if (node != myself && getImportingSlotSource(slot) == NULL) {
if (node != myself && getImportingSlot(slot) == NULL) {
if (node == NULL) {
clusterRedirectClient(c, NULL, 0, CLUSTER_REDIR_DOWN_UNBOUND);
} else {
Expand Down
4 changes: 2 additions & 2 deletions src/cluster.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ int clusterNodeIsNoFailover(clusterNode *node);
char *clusterNodeGetShardId(clusterNode *node);
int clusterNodeNumReplicas(clusterNode *node);
clusterNode *clusterNodeGetReplica(clusterNode *node, int replica_idx);
clusterNode *getMigratingSlotDest(int slot);
clusterNode *getImportingSlotSource(int slot);
clusterNode *getMigratingSlot(int slot);
clusterNode *getImportingSlot(int slot);
clusterNode *getNodeBySlot(int slot);
int clusterNodeClientPort(clusterNode *n, int use_tls);
char *clusterNodeHostname(clusterNode *node);
Expand Down
Loading
Loading