Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ gemspec
gem 'json', '< 3.0' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.2')

group :concurrent_ruby_ext, optional: ENV.key?('CI') && ENV['CONCURRENT_RUBY_EXT'] != 'true' do
gem 'concurrent-ruby-ext', '~> 1.1.3'
gem 'concurrent-ruby-ext', '~> 1.3.0'
end

group :pry, optional: ENV.key?('CI') do
Expand Down
5 changes: 3 additions & 2 deletions dynflow.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ Gem::Specification.new do |s|
s.required_ruby_version = '>= 3.0.0'

s.add_dependency "algebrick", '~> 0.7.0'
s.add_dependency "concurrent-ruby", '~> 1.1.3'
s.add_dependency "concurrent-ruby-edge", '~> 0.6.0'
s.add_dependency "concurrent-ruby", '>= 1.1.3', '< 2.0'
s.add_dependency "concurrent-ruby-edge", '~> 0.7.0'
s.add_dependency "csv", "~> 3.1"
s.add_dependency 'logger'
s.add_dependency "msgpack", '~> 1.3', '>= 1.3.3'
s.add_dependency "multi_json"
s.add_dependency "sequel", '>= 4.0.0'
Expand Down
1 change: 1 addition & 0 deletions lib/dynflow.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
require 'base64'
require 'concurrent'
require 'concurrent-edge'
require 'logger'

logger = Logger.new($stderr)
logger.level = Logger::INFO
Expand Down
5 changes: 4 additions & 1 deletion test/bats/sidekiq-orchestrator.bats
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,10 @@ teardown() {
wait_for 5 1 grep 'dynflow: Finished performing validity checks' "$(bg_output_file o1)"

podman stop "$POSTGRES_CONTAINER_NAME"
wait_for 60 1 grep 'dynflow: World terminated, exiting.' "$(bg_output_file o1)"
# With concurrent-ruby 1.3 the persistence error surfaces after
# MAX_RETRIES polling rounds, which pushes the termination log past a
# 60s window (observed ~58s); allow a generous margin.
wait_for 180 1 grep 'dynflow: World terminated, exiting.' "$(bg_output_file o1)"
}

@test "active orchestrator can withstand temporary pg connection drop" {
Expand Down
Loading