Skip to content

Commit

Permalink
RUBY-2771 Allow awaited hello to fail with EOF when client is shuttin…
Browse files Browse the repository at this point in the history
…g down (#2328)

Co-authored-by: Oleg Pudeyev <[email protected]>
  • Loading branch information
p-mongo and p committed Aug 23, 2021
1 parent dac141b commit 0f6d0e8
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 0 deletions.
6 changes: 6 additions & 0 deletions lib/mongo/server/push_monitor.rb
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,12 @@ def do_work
@topology_version = new_description.topology_version
end
rescue Mongo::Error => exc
stop_requested = @lock.synchronize { @stop_requested }
if stop_requested
# Ignore the exception, see RUBY-2771.
return
end

msg = "Error running awaited hello on #{server.address}"
Utils.warn_bg_exception(msg, exc,
logger: options[:logger],
Expand Down
44 changes: 44 additions & 0 deletions spec/stress/push_monitor_close_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# frozen_string_literal: true
# encoding: utf-8

require 'spec_helper'

# This test repeatedly creates and closes clients across several threads.
# Its goal is to ensure that the push monitor connections specifically get
# closed without any errors or warnings being reported to applications.
#
# Although the test is specifically meant to test 4.4+ servers (that utilize
# the push monitor) in non-LB connections, run it everywhere for good measure.
describe 'Push monitor close test' do
require_stress

let(:options) do
SpecConfig.instance.all_test_options
end

before(:all) do
# load if necessary
ClusterConfig.instance.primary_address
ClientRegistry.instance.close_all_clients
end

it 'does not warn/error on cleanup' do
Mongo::Logger.logger.should_not receive(:warn)

threads = 10.times.map do
Thread.new do
10.times do
client = new_local_client([ClusterConfig.instance.primary_address.seed], options)
if rand > 0.33
client.command(ping: 1)
sleep(rand * 3)
end
client.close
STDOUT << '.'
end
end
end
threads.each(&:join)
puts
end
end

0 comments on commit 0f6d0e8

Please sign in to comment.