mongo 2.16.0 → 2.16.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- checksums.yaml.gz.sig +0 -0
- data/lib/mongo/server/push_monitor.rb +4 -1
- data/lib/mongo/version.rb +1 -1
- data/spec/mongo/server/monitor/connection_spec.rb +22 -0
- data/spec/mongo/server/push_monitor_spec.rb +101 -0
- data.tar.gz.sig +0 -0
- metadata +1041 -1039
- metadata.gz.sig +0 -0
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 5b986d77f7607888a777a2a303a26a19d049d8caeca842afa9fc7623853a2dd2
|
4
|
+
data.tar.gz: 588242ff13c6444dc448bbc6a3a426364853ec126462053d8b1bbca696451939
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 343a0bdc5f04ffe468eb927e08d70dc58a2f08f7c88d8c530e4404eedb9ed218312b7860321351a05a345cf7b47189c2b28eb85e8dc362aba47b013c0ab62237
|
7
|
+
data.tar.gz: d70cb255d44299be00c02921964d5eeff8534dbce108ddf0d72f3fb80244db20b861e224bbb51527ae2edc93f16cc0170fe9f999e4fc960015ef16a1fd849c22
|
checksums.yaml.gz.sig
CHANGED
Binary file
|
@@ -110,7 +110,7 @@ module Mongo
|
|
110
110
|
if new_description.topology_version
|
111
111
|
@topology_version = new_description.topology_version
|
112
112
|
end
|
113
|
-
rescue Mongo::Error => exc
|
113
|
+
rescue IOError, SocketError, SystemCallError, Mongo::Error => exc
|
114
114
|
stop_requested = @lock.synchronize { @stop_requested }
|
115
115
|
if stop_requested
|
116
116
|
# Ignore the exception, see RUBY-2771.
|
@@ -123,6 +123,9 @@ module Mongo
|
|
123
123
|
log_prefix: options[:log_prefix],
|
124
124
|
bg_error_backtrace: options[:bg_error_backtrace],
|
125
125
|
)
|
126
|
+
|
127
|
+
# Avoid tight looping in push monitor - see RUBY-2806.
|
128
|
+
sleep(0.5)
|
126
129
|
end
|
127
130
|
|
128
131
|
def check
|
data/lib/mongo/version.rb
CHANGED
@@ -136,6 +136,28 @@ describe Mongo::Server::Monitor::Connection do
|
|
136
136
|
end
|
137
137
|
end
|
138
138
|
|
139
|
+
describe '#connect!' do
|
140
|
+
|
141
|
+
let(:options) do
|
142
|
+
SpecConfig.instance.test_options.merge(
|
143
|
+
app_metadata: monitor_app_metadata,
|
144
|
+
)
|
145
|
+
end
|
146
|
+
|
147
|
+
context 'when address resolution fails' do
|
148
|
+
let(:connection) { described_class.new(server.address, options) }
|
149
|
+
|
150
|
+
it 'propagates the exception' do
|
151
|
+
connection
|
152
|
+
|
153
|
+
expect(Socket).to receive(:getaddrinfo).and_raise(SocketError.new('Test exception'))
|
154
|
+
lambda do
|
155
|
+
connection.connect!
|
156
|
+
end.should raise_error(SocketError, 'Test exception')
|
157
|
+
end
|
158
|
+
end
|
159
|
+
end
|
160
|
+
|
139
161
|
describe '#check_document' do
|
140
162
|
context 'with API version' do
|
141
163
|
let(:meta) do
|
@@ -0,0 +1,101 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
# encoding: utf-8
|
3
|
+
|
4
|
+
require 'spec_helper'
|
5
|
+
|
6
|
+
describe Mongo::Server::PushMonitor do
|
7
|
+
before(:all) do
|
8
|
+
ClientRegistry.instance.close_all_clients
|
9
|
+
end
|
10
|
+
|
11
|
+
let(:address) do
|
12
|
+
default_address
|
13
|
+
end
|
14
|
+
|
15
|
+
let(:listeners) do
|
16
|
+
Mongo::Event::Listeners.new
|
17
|
+
end
|
18
|
+
|
19
|
+
let(:monitor_options) do
|
20
|
+
{}
|
21
|
+
end
|
22
|
+
|
23
|
+
let(:monitor_app_metadata) do
|
24
|
+
Mongo::Server::Monitor::AppMetadata.new(
|
25
|
+
server_api: SpecConfig.instance.ruby_options[:server_api],
|
26
|
+
)
|
27
|
+
end
|
28
|
+
|
29
|
+
let(:cluster) do
|
30
|
+
double('cluster').tap do |cluster|
|
31
|
+
allow(cluster).to receive(:run_sdam_flow)
|
32
|
+
allow(cluster).to receive(:heartbeat_interval).and_return(1000)
|
33
|
+
end
|
34
|
+
end
|
35
|
+
|
36
|
+
let(:server) do
|
37
|
+
Mongo::Server.new(address, cluster, Mongo::Monitoring.new, listeners,
|
38
|
+
monitoring_io: false)
|
39
|
+
end
|
40
|
+
|
41
|
+
let(:monitor) do
|
42
|
+
register_background_thread_object(
|
43
|
+
Mongo::Server::Monitor.new(server, listeners, Mongo::Monitoring.new,
|
44
|
+
SpecConfig.instance.test_options.merge(cluster: cluster).merge(monitor_options).update(
|
45
|
+
app_metadata: monitor_app_metadata,
|
46
|
+
push_monitor_app_metadata: monitor_app_metadata))
|
47
|
+
)
|
48
|
+
end
|
49
|
+
|
50
|
+
let(:topology_version) do
|
51
|
+
Mongo::TopologyVersion.new('processId' => BSON::ObjectId.new, 'counter' => 1)
|
52
|
+
end
|
53
|
+
|
54
|
+
let(:check_document) do
|
55
|
+
{hello: 1}
|
56
|
+
end
|
57
|
+
|
58
|
+
let(:push_monitor) do
|
59
|
+
described_class.new(monitor, topology_version, monitor.monitoring,
|
60
|
+
**monitor.options.merge(check_document: check_document))
|
61
|
+
end
|
62
|
+
|
63
|
+
describe '#do_work' do
|
64
|
+
it 'works' do
|
65
|
+
lambda do
|
66
|
+
push_monitor.do_work
|
67
|
+
end.should_not raise_error
|
68
|
+
end
|
69
|
+
|
70
|
+
context 'network error during check' do
|
71
|
+
it 'does not propagate the exception' do
|
72
|
+
push_monitor
|
73
|
+
|
74
|
+
expect(Socket).to receive(:getaddrinfo).and_raise(SocketError.new('Test exception'))
|
75
|
+
lambda do
|
76
|
+
push_monitor.do_work
|
77
|
+
end.should_not raise_error
|
78
|
+
end
|
79
|
+
|
80
|
+
it 'throttles checks' do
|
81
|
+
push_monitor
|
82
|
+
|
83
|
+
start = Mongo::Utils.monotonic_time
|
84
|
+
|
85
|
+
expect(Socket).to receive(:getaddrinfo).and_raise(SocketError.new('Test exception'))
|
86
|
+
lambda do
|
87
|
+
push_monitor.do_work
|
88
|
+
end.should_not raise_error
|
89
|
+
|
90
|
+
expect(Socket).to receive(:getaddrinfo).and_raise(SocketError.new('Test exception'))
|
91
|
+
lambda do
|
92
|
+
push_monitor.do_work
|
93
|
+
end.should_not raise_error
|
94
|
+
|
95
|
+
elapsed = Mongo::Utils.monotonic_time - start
|
96
|
+
elapsed.should > 0.5
|
97
|
+
end
|
98
|
+
end
|
99
|
+
end
|
100
|
+
|
101
|
+
end
|
data.tar.gz.sig
CHANGED
Binary file
|