Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix a bug for cross-slot validation in pipelining #1020

Merged
merged 2 commits into from
Jul 26, 2021
Merged

Fix a bug for cross-slot validation in pipelining #1020

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25715d5
Fix a bug for cross-slot validation for pipelining
supercaracal Jul 26, 2021
691aef7
Update test/cluster_client_pipelining_test.rb
supercaracal Jul 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions lib/redis/cluster.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,13 @@ def call_loop(command, timeout = 0, &block)
end

def call_pipeline(pipeline)
node_keys, command_keys = extract_keys_in_pipeline(pipeline)
raise CrossSlotPipeliningError, command_keys if node_keys.size > 1
node_keys = pipeline.commands.map { |cmd| find_node_key(cmd, primary_only: true) }.compact.uniq
if node_keys.size > 1
raise(CrossSlotPipeliningError,
pipeline.commands.map { |cmd| @command.extract_first_key(cmd) }.reject(&:empty?).uniq)
end

node = find_node(node_keys.first)
try_send(node, :call_pipeline, pipeline)
try_send(find_node(node_keys.first), :call_pipeline, pipeline)
end

def call_with_timeout(command, timeout, &block)
Expand Down Expand Up @@ -253,14 +255,14 @@ def assign_node(command)
find_node(node_key)
end

def find_node_key(command)
def find_node_key(command, primary_only: false)
key = @command.extract_first_key(command)
return if key.empty?

slot = KeySlotConverter.convert(key)
return unless @slot.exists?(slot)

if @command.should_send_to_master?(command)
if @command.should_send_to_master?(command) || primary_only
@slot.find_node_key_of_master(slot)
else
@slot.find_node_key_of_slave(slot)
Expand All @@ -285,11 +287,5 @@ def update_cluster_info!(node_key = nil)
@node.map(&:disconnect)
@node, @slot = fetch_cluster_info!(@option)
end

def extract_keys_in_pipeline(pipeline)
node_keys = pipeline.commands.map { |cmd| find_node_key(cmd) }.compact.uniq
command_keys = pipeline.commands.map { |cmd| @command.extract_first_key(cmd) }.reject(&:empty?)
[node_keys, command_keys]
end
end
end
22 changes: 22 additions & 0 deletions test/cluster_client_pipelining_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,26 @@ def test_pipelining_without_hash_tags
end
end
end

def test_pipelining_with_multiple_replicas
rc = build_another_client(replica: true)
rc.instance_variable_get(:@client).instance_variable_get(:@slot).instance_variable_get(:@map).each do |_, v|
v[:slaves] << v[:master] if v[:slaves].size < 2 # reproducing multiple replicas
end

rc.pipelined do |r|
r.get('key1')
r.get('key1')
r.get('key1')
r.get('key1')
r.get('key1')
r.get('key1')
r.get('key1')
r.get('key1')
r.get('key1')
r.get('key1')
supercaracal marked this conversation as resolved.
Show resolved Hide resolved
end

rc.close
end
end