caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-23 00:28:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

redis-trib: initial implementation of addnode command.

Browse Source
This commit is contained in:
antirez 2013-02-27 15:58:41 +01:00
parent f7dac639a9
commit 96dd210970
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/redis-trib.rb
View File

@ -85,7 +85,7 @@ class ClusterNode
def assert_empty def assert_empty
if !(@r.cluster("info").split("\r\n").index("cluster_known_nodes:1")) || if !(@r.cluster("info").split("\r\n").index("cluster_known_nodes:1")) ||
(@r.info['db0']) (@r.info['db0'])
puts "Error: Node #{self} is not empty. Either the node already knows other nodes (check with nodes-info) or contains some key in database 0." puts "Error: Node #{self} is not empty. Either the node already knows other nodes (check with CLUSTER NODES) or contains some key in database 0."
exit 1 exit 1
end end
end end
@ -402,7 +402,7 @@ class RedisTrib
end end
def load_cluster_info_from_node(nodeaddr) def load_cluster_info_from_node(nodeaddr)
node = ClusterNode.new(ARGV[1]) node = ClusterNode.new(nodeaddr)
node.connect(:abort => true) node.connect(:abort => true)
node.assert_cluster node.assert_cluster
node.load_info(:getfriends => true) node.load_info(:getfriends => true)
@ -578,13 +578,34 @@ class RedisTrib
join_cluster join_cluster
check_cluster check_cluster
end end
def addnode_cluster_cmd
puts "Adding node #{ARGV[1]} to cluster #{ARGV[2]}"
# Check the existing cluster
load_cluster_info_from_node(ARGV[2])
check_cluster
# Add the new node
new = ClusterNode.new(ARGV[1])
new.connect(:abort => true)
new.assert_cluster
new.load_info
new.assert_empty
first = @nodes.first.info
# Send CLUSTER MEET command to the new node
puts "Send CLUSTER MEET to node #{new} to make it join the cluster."
new.r.cluster("meet",first[:host],first[:port])
end
end end
COMMANDS={ COMMANDS={
"create" => ["create_cluster_cmd", -2, "host1:port1 ... hostN:portN"], "create" => ["create_cluster_cmd", -2, "host1:port1 ... hostN:portN"],
"check" => ["check_cluster_cmd", 2, "host:port"], "check" => ["check_cluster_cmd", 2, "host:port"],
"fix" => ["fix_cluster_cmd", 2, "host:port"], "fix" => ["fix_cluster_cmd", 2, "host:port"],
"reshard" => ["reshard_cluster_cmd", 2, "host:port"] "reshard" => ["reshard_cluster_cmd", 2, "host:port"],
"addnode" => ["addnode_cluster_cmd", 3, "new_host:new_port existing_host:existing_port"]
} }
# Sanity check # Sanity check