mongo 2.10.5 → 2.11.0.rc0

data/spec/mongo/server_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Mongo::Server do
+  fails_on_jruby
 
   declare_topology_double
 
@@ -28,16 +29,28 @@ describe Mongo::Server do
     server.pool
   end
 
-  describe '#==' do
+  let(:server_options) do
+    {}
+  end
 
-    let(:server) do
-      described_class.new(address, cluster, monitoring, listeners, SpecConfig.instance.test_options)
+  let(:server) do
+    register_server(
+      described_class.new(address, cluster, monitoring, listeners,
+        SpecConfig.instance.test_options.merge(monitoring_io: false).merge(server_options))
+    )
+  end
+
+  shared_context 'with monitoring io' do
+    let(:server_options) do
+      {monitoring_io: true}
     end
 
-    after do
-      expect(server).to receive(:pool).and_return(pool)
-      server.disconnect!
+    before do
+      allow(cluster).to receive(:heartbeat_interval).and_return(1000)
     end
+  end
+
+  describe '#==' do
 
     context 'when the other is not a server' do
 
@@ -55,7 +68,10 @@ describe Mongo::Server do
       context 'when the addresses match' do
 
         let(:other) do
-          described_class.new(address, cluster, monitoring, listeners, SpecConfig.instance.test_options)
+          register_server(
+            described_class.new(address, cluster, monitoring, listeners,
+              SpecConfig.instance.test_options.merge(monitoring_io: false))
+          )
         end
 
         it 'returns true' do
@@ -70,7 +86,10 @@ describe Mongo::Server do
         end
 
         let(:other) do
-          described_class.new(other_address, cluster, monitoring, listeners, SpecConfig.instance.test_options)
+          register_server(
+            described_class.new(other_address, cluster, monitoring, listeners,
+              SpecConfig.instance.test_options.merge(monitoring_io: false))
+          )
         end
 
         it 'returns false' do
@@ -82,37 +101,35 @@ describe Mongo::Server do
 
   describe '#disconnect!' do
 
-    let(:server) do
-      described_class.new(address, cluster, monitoring, listeners, SpecConfig.instance.test_options)
-    end
+    context 'with monitoring io' do
+      include_context 'with monitoring io'
 
-    it 'stops the monitor instance' do
-      expect(server.instance_variable_get(:@monitor)).to receive(:stop!).and_return(true)
-      expect(server).to receive(:pool).and_return(pool)
-      server.disconnect!
+      it 'stops the monitor instance' do
+        expect(server.instance_variable_get(:@monitor)).to receive(:stop!).and_call_original
+        server.disconnect!
+      end
     end
 
     it 'disconnects the connection pool' do
       expect(server.pool).to receive(:disconnect!).once.and_call_original
       server.disconnect!
     end
+
+    context 'when server reconnects' do
+      it 'keeps the same pool' do
+        pool = server.pool
+        server.disconnect!
+        server.reconnect!
+        expect(server.pool).to eq(pool)
+      end
+    end
   end
 
   describe '#initialize' do
+    include_context 'with monitoring io'
 
-    let(:server) do
-      described_class.new(
-        address,
-        cluster,
-        monitoring,
-        listeners,
-        SpecConfig.instance.test_options.merge(:heartbeat_frequency => 5)
-      )
-    end
-
-    after do
-      expect(server).to receive(:pool).and_return(pool)
-      server.disconnect!
+    before do
+      allow(cluster).to receive(:run_sdam_flow)
     end
 
     it 'sets the address host' do
@@ -124,7 +141,7 @@ describe Mongo::Server do
     end
 
     it 'sets the options' do
-      expect(server.options).to eq(SpecConfig.instance.test_options.merge(:heartbeat_frequency => 5))
+      expect(server.options[:monitoring_io]).to be true
     end
 
     it 'creates monitor with monitoring app metadata' do
@@ -132,53 +149,54 @@ describe Mongo::Server do
     end
 
     context 'monitoring_io: false' do
-      let(:server) do
-        described_class.new(
-          address,
-          cluster,
-          monitoring,
-          listeners,
-          SpecConfig.instance.test_options.merge(monitoring_io: false)
-        )
+
+      let(:server_options) do
+        {monitoring_io: false}
       end
 
       it 'does not create monitoring thread' do
         expect(server.monitor.instance_variable_get('@thread')).to be nil
       end
     end
+
+    context 'monitoring_io: true' do
+      include_context 'with monitoring io'
+
+      it 'creates monitoring thread' do
+        expect(server.monitor.instance_variable_get('@thread')).to be_a(Thread)
+      end
+    end
   end
 
   describe '#scan!' do
+    clean_slate
 
-    let(:server) do
-      described_class.new(address, cluster, monitoring, listeners, SpecConfig.instance.test_options)
+    include_context 'with monitoring io'
+
+    before do
+      # We are invoking scan! on the monitor manually, stop the background
+      # thread to avoid it interfering with our assertions.
+      server.monitor.stop!
     end
 
-    after do
-      expect(server).to receive(:pool).and_return(pool)
-      server.disconnect!
+    it 'delegates scan to the monitor' do
+      expect(server.monitor).to receive(:scan!)
+      server.scan!
     end
 
-    it 'forces a scan on the monitor' do
-      expect(server.scan!).to eq(server.description)
+    it 'invokes sdam flow eventually' do
+      expect(cluster).to receive(:run_sdam_flow)
+      server.scan!
     end
   end
 
   describe '#reconnect!' do
-
-    let(:server) do
-      described_class.new(address, cluster, monitoring, listeners, SpecConfig.instance.test_options)
-    end
+    include_context 'with monitoring io'
 
     before do
       expect(server.monitor).to receive(:restart!).and_call_original
     end
 
-    after do
-      expect(server).to receive(:pool).and_return(pool)
-      server.disconnect!
-    end
-
     it 'restarts the monitor and returns true' do
       expect(server.reconnect!).to be(true)
     end
@@ -186,10 +204,6 @@ describe Mongo::Server do
 
   describe 'retry_writes?' do
 
-    let(:server) do
-      described_class.new(address, cluster, monitoring, listeners, SpecConfig.instance.test_options)
-    end
-
     before do
       allow(server).to receive(:features).and_return(features)
     end
@@ -363,9 +377,9 @@ describe Mongo::Server do
     end
 
     context 'server is unknown' do
-      let(:server) do
-        described_class.new(address, cluster, monitoring, listeners,
-          SpecConfig.instance.test_options.merge(monitoring_io: false))
+
+      let(:server_options) do
+        {monitoring_io: false}
       end
 
       before do
@@ -395,4 +409,12 @@ describe Mongo::Server do
       end
     end
   end
+
+  describe '#log_warn' do
+    it 'works' do
+      expect do
+        server.log_warn('test warning')
+      end.not_to raise_error
+    end
+  end
 end

data/spec/mongo/session/session_pool_spec.rb

@@ -10,7 +10,7 @@ describe Mongo::Session::SessionPool do
       # Cluster time assertions can fail if there are background operations
       # that cause cluster time to be updated. This also necessitates clean
       # state requirement.
-      authorized_client.close(true)
+      authorized_client.close
     end
   end
 
@@ -161,10 +161,6 @@ describe Mongo::Session::SessionPool do
       subscribed_client
     end
 
-    after do
-      client.close(true)
-    end
-
     context 'when the number of ids is not larger than 10,000' do
 
       before do

data/spec/mongo/session_spec.rb

@@ -231,10 +231,6 @@ describe Mongo::Session do
         authorized_client.with(retry_writes: false)
       end
 
-      after do
-        client.close(true)
-      end
-
       it 'returns false' do
         expect(client.start_session.retry_writes?).to be(false)
       end

data/spec/mongo/socket/ssl_spec.rb

@@ -591,7 +591,7 @@ describe Mongo::Socket::SSL, retry: 3 do
         context 'bundled with intermediate cert' do
 
           # https://github.com/jruby/jruby-openssl/issues/181
-          fails_on_jruby
+          only_mri
 
           let(:options) do
             SpecConfig.instance.test_options.merge(
@@ -636,7 +636,7 @@ describe Mongo::Socket::SSL, retry: 3 do
         context 'bundled with intermediate cert' do
 
           # https://github.com/jruby/jruby-openssl/issues/181
-          fails_on_jruby
+          only_mri
 
           let(:options) do
             SpecConfig.instance.test_options.merge(

data/spec/mongo/srv/monitor_spec.rb

@@ -0,0 +1,211 @@
+require 'lite_spec_helper'
+
+describe Mongo::SRV::Monitor do
+  describe '#scan!' do
+    let(:hostname) do
+      'test1.test.build.10gen.cc.'
+    end
+
+    let(:hosts) do
+      [
+        'localhost.test.build.10gen.cc.:27017',
+        'localhost.test.build.10gen.cc.:27018',
+      ]
+    end
+
+    let(:records) do
+      double('records').tap do |records|
+        allow(records).to receive(:hostname).and_return(hostname)
+        allow(records).to receive(:hosts).and_return(hosts)
+        allow(records).to receive(:empty?).and_return(false)
+        allow(records).to receive(:min_ttl).and_return(nil)
+      end
+    end
+
+
+    let(:cluster) do
+      Mongo::Cluster.new(records.hosts, Mongo::Monitoring.new, { monitoring_io: false })
+    end
+
+    let(:monitoring) do
+      described_class.new(cluster, resolver, records)
+    end
+
+    before do
+      monitoring.scan!
+    end
+
+    context 'when a new DNS record is added' do
+      let(:new_hosts) do
+        hosts + ['test1.test.build.10gen.cc.:27019']
+      end
+
+      let(:new_records) do
+        double('records').tap do |records|
+          allow(records).to receive(:hostname).and_return(hostname)
+          allow(records).to receive(:hosts).and_return(new_hosts)
+          allow(records).to receive(:empty?).and_return(false)
+          allow(records).to receive(:min_ttl).and_return(nil)
+        end
+      end
+
+      let(:resolver) do
+        double('resolver').tap do |resolver|
+          allow(resolver).to receive(:get_records).and_return(new_records)
+        end
+      end
+
+      it 'adds the new host to the cluster' do
+        expect(cluster.addresses.map(&:to_s).sort).to eq(new_hosts.sort)
+      end
+    end
+
+    context 'when a DNS record is removed' do
+      let(:new_hosts) do
+        hosts - ['test1.test.build.10gen.cc.:27018']
+      end
+
+      let(:new_records) do
+        double('records').tap do |records|
+          allow(records).to receive(:hostname).and_return(hostname)
+          allow(records).to receive(:hosts).and_return(new_hosts)
+          allow(records).to receive(:empty?).and_return(false)
+          allow(records).to receive(:min_ttl).and_return(nil)
+        end
+      end
+
+      let(:resolver) do
+        double('resolver').tap do |resolver|
+          allow(resolver).to receive(:get_records).and_return(new_records)
+        end
+      end
+
+      it 'adds the new host to the cluster' do
+        expect(cluster.addresses.map(&:to_s).sort).to eq(new_hosts.sort)
+      end
+    end
+
+    context 'when a single DNS record is replaced' do
+      let(:new_hosts) do
+        hosts - ['test1.test.build.10gen.cc.:27018'] +  ['test1.test.build.10gen.cc.:27019']
+      end
+
+      let(:new_records) do
+        double('records').tap do |records|
+          allow(records).to receive(:hostname).and_return(hostname)
+          allow(records).to receive(:hosts).and_return(new_hosts)
+          allow(records).to receive(:empty?).and_return(false)
+          allow(records).to receive(:min_ttl).and_return(nil)
+        end
+      end
+
+      let(:resolver) do
+        double('resolver').tap do |resolver|
+          allow(resolver).to receive(:get_records).and_return(new_records)
+        end
+      end
+
+      it 'adds the new host to the cluster' do
+        expect(cluster.addresses.map(&:to_s).sort).to eq(new_hosts.sort)
+      end
+    end
+
+    context 'when all DNS records are replaced with a single record' do
+      let(:new_hosts) do
+        ['test1.test.build.10gen.cc.:27019']
+      end
+
+      let(:new_records) do
+        double('records').tap do |records|
+          allow(records).to receive(:hostname).and_return(hostname)
+          allow(records).to receive(:hosts).and_return(new_hosts)
+          allow(records).to receive(:empty?).and_return(false)
+          allow(records).to receive(:min_ttl).and_return(nil)
+        end
+      end
+
+      let(:resolver) do
+        double('resolver').tap do |resolver|
+          allow(resolver).to receive(:get_records).and_return(new_records)
+        end
+      end
+
+      it 'adds the new host to the cluster' do
+        expect(cluster.addresses.map(&:to_s).sort).to eq(new_hosts.sort)
+      end
+    end
+
+    context 'when all DNS records are replaced with multiple records' do
+      let(:new_hosts) do
+        [
+          'test1.test.build.10gen.cc.:27019',
+          'test1.test.build.10gen.cc.:27020',
+        ]
+      end
+
+      let(:new_records) do
+        double('records').tap do |records|
+          allow(records).to receive(:hostname).and_return(hostname)
+          allow(records).to receive(:hosts).and_return(new_hosts)
+          allow(records).to receive(:empty?).and_return(false)
+          allow(records).to receive(:min_ttl).and_return(nil)
+        end
+      end
+
+      let(:resolver) do
+        double('resolver').tap do |resolver|
+          allow(resolver).to receive(:get_records).and_return(new_records)
+        end
+      end
+
+      it 'adds the new host to the cluster' do
+        expect(cluster.addresses.map(&:to_s).sort).to eq(new_hosts.sort)
+      end
+    end
+
+    context 'when the DNS lookup times out' do
+      let(:resolver) do
+        double('resolver').tap do |resolver|
+          allow(resolver).to receive(:get_records).and_raise(Resolv::ResolvTimeout)
+        end
+      end
+
+      it 'does not add or remove any hosts from the cluster' do
+        expect(cluster.addresses.map(&:to_s).sort).to eq(hosts.sort)
+      end
+    end
+
+    context 'when the DNS lookup is unable to resolve the hostname' do
+     let(:resolver) do
+        double('resolver').tap do |resolver|
+          allow(resolver).to receive(:get_records).and_raise(Resolv::ResolvError)
+        end
+      end
+
+      it 'does not add or remove any hosts from the cluster' do
+        expect(cluster.addresses.map(&:to_s).sort).to eq(hosts.sort)
+      end
+    end
+
+    context 'when no DNS records are returned' do
+      let(:new_records) do
+        double('records').tap do |records|
+          allow(records).to receive(:hostname).and_return(hostname)
+          allow(records).to receive(:hosts).and_return([])
+          allow(records).to receive(:empty?).and_return(true)
+          allow(records).to receive(:min_ttl).and_return(nil)
+        end
+      end
+
+      let(:resolver) do
+        double('resolver').tap do |resolver|
+          allow(resolver).to receive(:get_records).and_return(new_records)
+        end
+      end
+
+      it 'does not add or remove any hosts from the cluster' do
+        expect(cluster.addresses.map(&:to_s).sort).to eq(hosts.sort)
+      end
+    end
+  end
+end