fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-04 16:51:12 +00:00
Code Issues Projects Releases Wiki Activity

Cluster Manager: enable --cluster-replace also for 'fix' command.

Browse Source
This commit is contained in:
artix 2018-12-19 17:27:58 +01:00
parent f07205e48c
commit 503fd229e4
1 changed files with 34 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/redis-cli.c
View File

@ -3149,17 +3149,19 @@ static int clusterManagerMigrateKeysInSlot(clusterManagerNode *source,
* - In other cases (ie. reshard), proceed only if the user * - In other cases (ie. reshard), proceed only if the user
* launched the command with the --cluster-replace option.*/ * launched the command with the --cluster-replace option.*/
if (is_busy) { if (is_busy) {
clusterManagerLogWarn("\n*** Target key exists, " clusterManagerLogWarn("\n*** Target key exists\n");
"checking values...\n"); if (!do_replace) {
clusterManagerLogWarn("*** Checking key values on "
"both nodes...\n");
list *diffs = listCreate(); list *diffs = listCreate();
success = clusterManagerCompareKeysValues(source, success = clusterManagerCompareKeysValues(source,
target, reply, diffs); target, reply, diffs);
if (!success && (do_fix || !do_replace)) { if (!success) {
listRelease(diffs);
clusterManagerLogErr("*** Value check failed!\n"); clusterManagerLogErr("*** Value check failed!\n");
listRelease(diffs);
goto next; goto next;
} }
if (listLength(diffs) > 0 && (do_fix || !do_replace)) { if (listLength(diffs) > 0) {
success = 0; success = 0;
clusterManagerLogErr( clusterManagerLogErr(
"*** Found %d key(s) in both source node and " "*** Found %d key(s) in both source node and "
@ -3178,19 +3180,16 @@ static int clusterManagerMigrateKeysInSlot(clusterManagerNode *source,
clusterManagerLogErr(" - %s\n", k); clusterManagerLogErr(" - %s\n", k);
} }
clusterManagerLogErr("Please fix the above key(s) " clusterManagerLogErr("Please fix the above key(s) "
"manually "); "manually and try again "
if (do_fix) "or relaunch the command \n"
clusterManagerLogErr("and try again!\n");
else {
clusterManagerLogErr("or relaunch the command "
"with --cluster-replace " "with --cluster-replace "
"option to force key " "option to force key "
"overriding.\n"); "overriding.\n");
}
listRelease(diffs); listRelease(diffs);
goto next; goto next;
} }
listRelease(diffs); listRelease(diffs);
}
clusterManagerLogWarn("*** Replacing target keys...\n"); clusterManagerLogWarn("*** Replacing target keys...\n");
} }
freeReplyObject(migrate_reply); freeReplyObject(migrate_reply);