fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-17 16:10:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1628 from mattsta/fix-trib-create

Browse Source 
Cluster: Fix trib create when masters==replicas
This commit is contained in:
Salvatore Sanfilippo 2014-03-24 18:26:17 +01:00
commit a006fcb8a7
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/redis-trib.rb
View File

@ -554,14 +554,28 @@ class RedisTrib
# We try to split the replicas among all the IPs with spare nodes
# trying to avoid the host where the master is running, if possible.
#
# Note that we loop two times, the first with spare_loop set to false,
# the second with the var set to true. The second loop changes the
# while condition so to assign remaining slaves.
[false,true].each{|spare_loop|
# Note we loop two times. The first loop assigns the requested
# number of replicas to each master. The second loop assigns any
# remaining instances as extra replicas to masters. Some masters
# may end up with more than their requested number of replicas, but
# all nodes will be used.
assignment_verbose = false
[:requested,:unused].each{|assign|
masters.each{|m|
i = 0
while (!spare_loop && i < @replicas) || \
(spare_loop && nodes_count > 0)
assigned_replicas = 0
while assigned_replicas < @replicas
break if nodes_count == 0
if assignment_verbose
if assign == :requested
puts "Requesting total of #{@replicas} replicas " \
"(#{assigned_replicas} replicas assigned " \
"so far with #{nodes_count} total remaining)."
elsif assign == :unused
puts "Assigning extra instance to replication " \
"role too (#{nodes_count} remaining)."
end
end
ips.each{|ip,nodes_list|
next if nodes_list.length == 0
# Skip instances with the same IP as the master if we
@ -570,7 +584,7 @@ class RedisTrib
slave = nodes_list.shift
slave.set_as_replica(m.info[:name])
nodes_count -= 1
i += 1
assigned_replicas += 1
puts "Adding replica #{slave} to #{m}"
}
end