Unverified Commit e9662641 authored by fayadexinqing's avatar fayadexinqing Committed by GitHub
Browse files

fix migration's broadcast PONG message, after the slot modification (#7590)

parent c17e597d
...@@ -4503,6 +4503,9 @@ NULL ...@@ -4503,6 +4503,9 @@ NULL
server.cluster->migrating_slots_to[slot]) server.cluster->migrating_slots_to[slot])
server.cluster->migrating_slots_to[slot] = NULL; server.cluster->migrating_slots_to[slot] = NULL;
clusterDelSlot(slot);
clusterAddSlot(n,slot);
/* If this node was importing this slot, assigning the slot to /* If this node was importing this slot, assigning the slot to
* itself also clears the importing status. */ * itself also clears the importing status. */
if (n == myself && if (n == myself &&
...@@ -4526,8 +4529,6 @@ NULL ...@@ -4526,8 +4529,6 @@ NULL
* soon as possible. */ * soon as possible. */
clusterBroadcastPong(CLUSTER_BROADCAST_ALL); clusterBroadcastPong(CLUSTER_BROADCAST_ALL);
} }
clusterDelSlot(slot);
clusterAddSlot(n,slot);
} else { } else {
addReplyError(c, addReplyError(c,
"Invalid CLUSTER SETSLOT action or number of arguments. Try CLUSTER HELP"); "Invalid CLUSTER SETSLOT action or number of arguments. Try CLUSTER HELP");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment