Skip to content

Use Concurrent::Set instead of Set #354

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

Merged
ChrisBr merged 1 commit into from
Aug 19, 2025
Merged

Use Concurrent::Set instead of Set #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions ruby/lib/ci/queue/redis/worker.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true
require 'ci/queue/static'
require 'set'
require 'concurrent/set'

module CI
module Queue
Expand All @@ -16,7 +16,7 @@ class Worker < Base
attr_reader :total

def initialize(redis, config)
@reserved_tests = Set.new
@reserved_tests = Concurrent::Set.new
@shutdown_required = false
super(redis, config)
end
Expand Down Expand Up @@ -154,7 +154,7 @@ def release!
attr_reader :index

def reserved_tests
@reserved_tests ||= Set.new
@reserved_tests ||= Concurrent::Set.new
end

def worker_id
Expand Down
4 changes: 3 additions & 1 deletion ruby/lib/ci/queue/static.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# frozen_string_literal: true

require 'concurrent/set'

module CI
module Queue
class Static
Expand Down Expand Up @@ -145,7 +147,7 @@ def requeues
end

def reserved_tests
@reserved_tests ||= Set.new
@reserved_tests ||= Concurrent::Set.new
end
end
end
Expand Down
3 changes: 2 additions & 1 deletion ruby/test/integration/minitest_redis_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
require 'tmpdir'
require 'active_support'
require 'active_support/testing/time_helpers'
require 'concurrent/set'

module Integration
class MinitestRedisTest < Minitest::Test
Expand Down Expand Up @@ -509,7 +510,7 @@ def test_retry_report
assert_equal 100, error_reports.size

error_reports.keys.each_with_index do |test_id, index|
queue.instance_variable_set(:@reserved_tests, Set.new([test_id]))
queue.instance_variable_set(:@reserved_tests, Concurrent::Set.new([test_id]))
queue.build.record_success(test_id.dup, stats: {
'assertions' => index + 1,
'errors' => 0,
Expand Down
3 changes: 2 additions & 1 deletion ruby/test/minitest/queue/build_status_recorder_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# frozen_string_literal: true
require 'test_helper'
require 'concurrent/set'

module Minitest::Queue
class BuildStatusRecorderTest < Minitest::Test
Expand Down Expand Up @@ -123,7 +124,7 @@ def test_static_queue_record_success
private

def reserve(queue, method_name)
queue.instance_variable_set(:@reserved_tests, Set.new([Minitest::Queue::SingleExample.new("Minitest::Test", method_name).id]))
queue.instance_variable_set(:@reserved_tests, Concurrent::Set.new([Minitest::Queue::SingleExample.new("Minitest::Test", method_name).id]))
end

def worker(id)
Expand Down
Loading