Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
5b2082ea
Commit
5b2082ea
authored
Feb 10, 2014
by
antirez
Browse files
Cluster: replica migration should only work for masters serving slots.
parent
f106a793
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/cluster.c
View file @
5b2082ea
...
...
@@ -2264,7 +2264,7 @@ void clusterHandleSlaveMigration(int max_slaves) {
if (nodeIsSlave(node) || nodeFailed(node)) continue;
okslaves = clusterCountNonFailingSlaves(node);
if
(
okslaves
==
0
&&
target
==
NULL
)
target
=
node
;
if (okslaves == 0 && target == NULL
&& node->numslots > 0
) target = node;
if (okslaves == max_slaves) {
for (j = 0; j < node->numslaves; j++) {
if (memcmp(node->slaves[j]->name,
...
...
@@ -2487,7 +2487,7 @@ void clusterCron(void) {
if (nodeIsSlave(myself) && nodeIsMaster(node) && !nodeFailed(node)) {
int okslaves = clusterCountNonFailingSlaves(node);
if
(
okslaves
==
0
)
orphaned_masters
++
;
if (okslaves ==
0 && node->numslots >
0) orphaned_masters++;
if (okslaves > max_slaves) max_slaves = okslaves;
if (nodeIsSlave(myself) && myself->slaveof == node)
this_slaves = okslaves;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment