mongo 2.0.5 → 2.0.6

data/spec/mongo/server/monitor_spec.rb

@@ -22,7 +22,7 @@ describe Mongo::Server::Monitor do
         start = Time.now
         monitor.scan!
         monitor.scan!
-        expect(Time.now - start).to be > 0.5
+        expect(Time.now - start).to be >= 0.5
       end
     end
 

data/spec/mongo/server_discovery_and_monitoring_spec.rb

@@ -32,10 +32,11 @@ describe 'Server Discovery and Monitoring' do
         # @since 2.0.0
         class Mongo::Server
 
-          # The contructor keeps the same API, but does not instantiate a
+          # The constructor keeps the same API, but does not instantiate a
           # monitor and run it.
-          def initialize(address, event_listeners, options = {})
+          def initialize(address, cluster, event_listeners, options = {})
             @address = address
+            @cluster = cluster
             @options = options.freeze
             @monitor = Monitor.new(address, event_listeners, options)
           end
@@ -58,8 +59,9 @@ describe 'Server Discovery and Monitoring' do
         class Mongo::Server
 
           # Returns the constructor to its original implementation.
-          def initialize(address, event_listeners, options = {})
+          def initialize(address, cluster, event_listeners, options = {})
             @address = address
+            @cluster = cluster
             @options = options.freeze
             @monitor = Monitor.new(address, event_listeners, options)
             @monitor.scan!
@@ -90,17 +92,27 @@ describe 'Server Discovery and Monitoring' do
         context("Phase: #{index + 1}") do
 
           phase.responses.each do |response|
-
             before do
               # For each response in the phase, we need to change that server's
               # description.
               server = find_server(@client, response.address)
+              server = Mongo::Server.new(Mongo::Address.new(response.address), @client.cluster,
+                                         @client.cluster.send(:event_listeners), @client.cluster.options) unless server
               monitor = server.instance_variable_get(:@monitor)
               description = monitor.inspector.run(server.description, response.ismaster, 0.5)
               monitor.instance_variable_set(:@description, description)
             end
           end
 
+          let(:cluster_addresses) do
+            @client.cluster.instance_variable_get(:@servers).
+              collect(&:address).collect(&:to_s).uniq.sort
+          end
+
+          let(:phase_addresses) do
+            phase.outcome.servers.keys.sort
+          end
+
           it "sets the cluster topology to #{phase.outcome.topology_type}" do
             expect(@client.cluster).to be_topology(phase.outcome.topology_type)
           end
@@ -109,6 +121,10 @@ describe 'Server Discovery and Monitoring' do
             expect(@client.cluster.replica_set_name).to eq(phase.outcome.set_name)
           end
 
+          it "has the expected servers in the cluster" do
+            expect(cluster_addresses).to eq(phase_addresses)
+          end
+
           phase.outcome.servers.each do |uri, server|
 
             it "sets #{uri} to #{server['type']}" do

data/spec/mongo/server_selection_spec.rb

@@ -26,7 +26,7 @@ describe 'Server Selection' do
       let(:candidate_servers) do
         spec.candidate_servers.collect do |server|
           address = Mongo::Address.new(server['address'])
-          Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS).tap do |s|
+          Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS).tap do |s|
             allow(s).to receive(:average_round_trip_time).and_return(server['avg_rtt_ms'])
             allow(s).to receive(:tags).and_return(server['tags'])
             allow(s).to receive(:secondary?).and_return(server['type'] == 'RSSecondary')
@@ -38,7 +38,7 @@ describe 'Server Selection' do
       let(:in_latency_window) do
         spec.in_latency_window.collect do |server|
           address = Mongo::Address.new(server['address'])
-          Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS).tap do |s|
+          Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS).tap do |s|
             allow(s).to receive(:average_round_trip_time).and_return(server['avg_rtt_ms'])
             allow(s).to receive(:tags).and_return(server['tags'])
           end

data/spec/mongo/server_spec.rb

@@ -2,6 +2,10 @@ require 'spec_helper'
 
 describe Mongo::Server do
 
+  let(:cluster) do
+    double('cluster')
+  end
+
   let(:listeners) do
     Mongo::Event::Listeners.new
   end
@@ -13,7 +17,7 @@ describe Mongo::Server do
   describe '#==' do
 
     let(:server) do
-      described_class.new(address, listeners, TEST_OPTIONS)
+      described_class.new(address, cluster, listeners, TEST_OPTIONS)
     end
 
     context 'when the other is not a server' do
@@ -32,7 +36,7 @@ describe Mongo::Server do
       context 'when the addresses match' do
 
         let(:other) do
-          described_class.new(address, listeners, TEST_OPTIONS)
+          described_class.new(address, cluster, listeners, TEST_OPTIONS)
         end
 
         it 'returns true' do
@@ -47,7 +51,7 @@ describe Mongo::Server do
         end
 
         let(:other) do
-          described_class.new(other_address, listeners, TEST_OPTIONS)
+          described_class.new(other_address, cluster, listeners, TEST_OPTIONS)
         end
 
         it 'returns false' do
@@ -60,7 +64,7 @@ describe Mongo::Server do
   describe '#context' do
 
     let(:server) do
-      described_class.new(address, listeners, TEST_OPTIONS)
+      described_class.new(address, cluster, listeners, TEST_OPTIONS)
     end
 
     let(:context) do
@@ -75,7 +79,7 @@ describe Mongo::Server do
   describe '#disconnect!' do
 
     let(:server) do
-      described_class.new(address, listeners, TEST_OPTIONS)
+      described_class.new(address, cluster, listeners, TEST_OPTIONS)
     end
 
     it 'stops the monitor instance' do
@@ -87,7 +91,7 @@ describe Mongo::Server do
   describe '#initialize' do
 
     let(:server) do
-      described_class.new(address, listeners, TEST_OPTIONS.merge(:heartbeat_frequency => 5))
+      described_class.new(address, cluster, listeners, TEST_OPTIONS.merge(:heartbeat_frequency => 5))
     end
 
     it 'sets the address host' do
@@ -106,7 +110,7 @@ describe Mongo::Server do
   describe '#pool' do
 
     let(:server) do
-      described_class.new(address, listeners, TEST_OPTIONS)
+      described_class.new(address, cluster, listeners, TEST_OPTIONS)
     end
 
     let(:pool) do
@@ -121,7 +125,7 @@ describe Mongo::Server do
   describe '#scan!' do
 
     let(:server) do
-      described_class.new(address, listeners, TEST_OPTIONS)
+      described_class.new(address, cluster, listeners, TEST_OPTIONS)
     end
 
     it 'forces a scan on the monitor' do

data/spec/support/authorization.rb

@@ -36,14 +36,14 @@ DEFAULT_ADDRESS = ADDRESSES.first
 # The topology type.
 #
 # @since 2.0.0
-CONNECT = ENV['RS_ENABLED'] == 'true' ? :replica_set.freeze :
-            ENV['SHARDED_ENABLED'] == 'true' ? :sharded.freeze :
-            :direct.freeze
+CONNECT = ENV['RS_ENABLED'] == 'true' ? { connect: :replica_set, replica_set: ENV['RS_NAME'] } :
+          ENV['SHARDED_ENABLED'] == 'true' ? { connect: :sharded } :
+          { connect: :direct }
 
 # The write concern to use in the tests.
 #
 # @since 2.0.0
-WRITE_CONCERN = (CONNECT == :replica_set) ? { w: ADDRESSES.size } : { w: 1 }
+WRITE_CONCERN = CONNECT[:connect] == :replica_set ? { w: ADDRESSES.size } : { w: 1 }
 
 # Whether to use SSL.
 #
@@ -53,10 +53,10 @@ SSL = ENV['SSL_ENABLED'] == 'true'
 # Options for test suite clients.
 #
 # @since 2.0.3
-TEST_OPTIONS = { connect: CONNECT,
-                 max_pool_size: 1,
-                 write: WRITE_CONCERN,
-                 ssl: SSL }
+TEST_OPTIONS = CONNECT.merge(max_pool_size: 1,
+                             write: WRITE_CONCERN,
+                             ssl: SSL,
+                             server_selection_timeout: 3)
 
 # The root user name.
 #

data/spec/support/sdam/rs/discover_passives.yml

@@ -34,6 +34,42 @@ phases: [
                 }
             },
 
+            topologyType: "ReplicaSetWithPrimary",
+            setName: "rs"
+        }
+    },
+    {
+        responses: [
+
+                ["b:27017", {
+
+                    ok: 1,
+                    ismaster: false,
+                    secondary: true,
+                    passive: true,
+                    hosts: ["a:27017"],
+                    passives: ["b:27017"],
+                    setName: "rs"
+                }]
+        ],
+
+        outcome: {
+
+            servers: {
+
+                "a:27017": {
+
+                    type: "RSPrimary",
+                    setName: "rs"
+                },
+
+                "b:27017": {
+
+                    type: "RSSecondary",
+                    setName: "rs"
+                }
+            },
+
             topologyType: "ReplicaSetWithPrimary",
             setName: "rs"
         }

data/spec/support/sdam/rs/new_primary_wrong_set_name.yml

@@ -12,7 +12,7 @@ phases: [
 
                     ok: 1,
                     ismaster: true,
-                    hosts: ["a", "b"],
+                    hosts: ["a:27017", "b:27017"],
                     setName: "rs"
                 }]
         ],
@@ -48,7 +48,7 @@ phases: [
 
                     ok: 1,
                     ismaster: true,
-                    hosts: ["a"],
+                    hosts: ["a:27017"],
                     setName: "wrong"
                 }]
         ],

data/spec/support/sdam/rs/primary_becomes_standalone.yml

@@ -11,7 +11,7 @@ phases: [
 
                     ok: 1,
                     ismaster: true,
-                    hosts: ["a"],
+                    hosts: ["a:27017"],
                     setName: "rs"
                 }]
         ],

data/spec/support/sdam/rs/primary_changes_set_name.yml

@@ -12,7 +12,7 @@ phases: [
 
                     ok: 1,
                     ismaster: true,
-                    hosts: ["a"],
+                    hosts: ["a:27017"],
                     setName: "rs"
                 }]
         ],
@@ -41,7 +41,7 @@ phases: [
 
                     ok: 1,
                     ismaster: true,
-                    hosts: ["a"],
+                    hosts: ["a:27017"],
                     setName: "wrong"
                 }]
         ],

data/spec/support/sdam/rs/primary_disconnect.yml

@@ -11,7 +11,7 @@ phases: [
 
                     ok: 1,
                     ismaster: true,
-                    hosts: ["a"],
+                    hosts: ["a:27017"],
                     setName: "rs"
                 }]
         ],

data/spec/support/sdam/rs/primary_wrong_set_name.yml

@@ -11,7 +11,7 @@ phases: [
 
                     ok: 1,
                     ismaster: true,
-                    hosts: ["a"],
+                    hosts: ["a:27017"],
                     setName: "wrong"
                 }]
         ],

data/spec/support/sdam/rs/secondary_wrong_set_name.yml

@@ -12,7 +12,7 @@ phases: [
                     ok: 1,
                     ismaster: false,
                     secondary: true,
-                    hosts: ["a"],
+                    hosts: ["a:27017"],
                     setName: "wrong"
                 }]
         ],

data/spec/support/sdam/rs/secondary_wrong_set_name_with_primary.yml

@@ -11,7 +11,7 @@ phases: [
 
                     ok: 1,
                     ismaster: true,
-                    hosts: ["a", "b"],
+                    hosts: ["a:27017", "b:27017"],
                     setName: "rs"
                 }]
         ],
@@ -46,7 +46,7 @@ phases: [
                     ok: 1,
                     ismaster: false,
                     secondary: true,
-                    hosts: ["a", "b"],
+                    hosts: ["a:27017", "b:27017"],
                     setName: "wrong"
                 }]
         ],

data/spec/support/sdam/sharded/single_mongos.yml

@@ -0,0 +1,33 @@
+description: "Single mongos"
+
+uri: "mongodb://a"
+
+phases: [
+
+    {
+        responses: [
+
+                ["a:27017", {
+
+                    ok: 1,
+                    ismaster: true,
+                    msg: "isdbgrid"
+                }]
+        ],
+
+        outcome: {
+
+            servers: {
+
+                "a:27017": {
+
+                    type: "Mongos",
+                    setName:
+                }
+            },
+
+            topologyType: "Sharded",
+            setName:
+        }
+    }
+]

data/spec/support/shared/operation.rb

@@ -5,6 +5,10 @@ shared_context 'operation' do
   let(:write_concern) { Mongo::WriteConcern.get(:w => 1) }
   let(:options) { {} }
 
+  let(:cluster_double) do
+    double('cluster')
+  end
+
   # Server doubles
   let(:secondary_server) do
     double('secondary_server').tap do |s|
@@ -43,7 +47,8 @@ shared_context 'operation' do
       allow(cxt).to receive(:primary?) { true }
       allow(cxt).to receive(:secondary?) { false }
       allow(cxt).to receive(:standalone?) { false }
-      allow(cxt).to receive(:slave_ok?) { false }
+      allow(cxt).to receive(:cluster) { cluster_double }
+      allow(cluster_double).to receive(:single?) { false }
     end
   end
   let(:secondary_context) do
@@ -55,7 +60,8 @@ shared_context 'operation' do
       allow(cxt).to receive(:secondary?) { true }
       allow(cxt).to receive(:primary?) { false }
       allow(cxt).to receive(:standalone?) { false }
-      allow(cxt).to receive(:slave_ok?) { false }
+      allow(cxt).to receive(:cluster) { cluster_double }
+      allow(cluster_double).to receive(:single?) { false }
     end
   end
   let(:secondary_context_slave) do
@@ -67,7 +73,8 @@ shared_context 'operation' do
       allow(cxt).to receive(:secondary?) { true }
       allow(cxt).to receive(:primary?) { false }
       allow(cxt).to receive(:standalone?) { false }
-      allow(cxt).to receive(:slave_ok?) { true }
+      allow(cxt).to receive(:cluster) { cluster_double }
+      allow(cluster_double).to receive(:single?) { true }
     end
   end
   let(:primary_context_2_4_version) do
@@ -78,7 +85,8 @@ shared_context 'operation' do
       allow(cxt).to receive(:primary?) { true }
       allow(cxt).to receive(:secondary?) { false }
       allow(cxt).to receive(:standalone?) { false }
-      allow(cxt).to receive(:slave_ok?) { false }
+      allow(cxt).to receive(:cluster) { cluster_double }
+      allow(cluster_double).to receive(:single?) { false }
       allow(cxt).to receive(:features) { features_2_4 }
     end
   end

data/spec/support/shared/server_selector.rb

@@ -13,7 +13,7 @@ def server(mode, options = {})
   listeners = Mongo::Event::Listeners.new
   address = Mongo::Address.new('127.0.0.1:27017')
 
-  server = Mongo::Server.new(address, listeners, TEST_OPTIONS)
+  server = Mongo::Server.new(address, double('cluster'), listeners, TEST_OPTIONS)
   description = Mongo::Server::Description.new(address, ismaster, average_round_trip_time)
   server.tap do |s|
     allow(s).to receive(:description).and_return(description)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Tyler Brock
@@ -32,7 +32,7 @@ cert_chain:
   o2UXDbWtz5PqoFd8EgNJAn3+BG1pwC9S9pVFG3WPucfAx/bE8iq/vvchHei5Y/Vo
   aAz5f/hY4zFeYWvGDBHYEXE1rTN2hhMSyJscPcFbmz0=
   -----END CERTIFICATE-----
-date: 2015-06-11 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
@@ -129,11 +129,11 @@ files:
 - lib/mongo/error/socket_timeout_error.rb
 - lib/mongo/error/unsupported_features.rb
 - lib/mongo/event.rb
+- lib/mongo/event/description_changed.rb
 - lib/mongo/event/listeners.rb
 - lib/mongo/event/primary_elected.rb
 - lib/mongo/event/publisher.rb
-- lib/mongo/event/server_added.rb
-- lib/mongo/event/server_removed.rb
+- lib/mongo/event/standalone_discovered.rb
 - lib/mongo/event/subscriber.rb
 - lib/mongo/grid.rb
 - lib/mongo/grid/file.rb
@@ -219,9 +219,9 @@ files:
 - lib/mongo/server/description.rb
 - lib/mongo/server/description/features.rb
 - lib/mongo/server/description/inspector.rb
+- lib/mongo/server/description/inspector/description_changed.rb
 - lib/mongo/server/description/inspector/primary_elected.rb
-- lib/mongo/server/description/inspector/server_added.rb
-- lib/mongo/server/description/inspector/server_removed.rb
+- lib/mongo/server/description/inspector/standalone_discovered.rb
 - lib/mongo/server/monitor.rb
 - lib/mongo/server/monitor/connection.rb
 - lib/mongo/server_selector.rb
@@ -259,6 +259,7 @@ files:
 - spec/mongo/cluster/topology/replica_set_spec.rb
 - spec/mongo/cluster/topology/sharded_spec.rb
 - spec/mongo/cluster/topology/single_spec.rb
+- spec/mongo/cluster/topology/unknown_spec.rb
 - spec/mongo/cluster/topology_spec.rb
 - spec/mongo/cluster_spec.rb
 - spec/mongo/collection/view/aggregation_spec.rb
@@ -320,9 +321,8 @@ files:
 - spec/mongo/server/connection_pool_spec.rb
 - spec/mongo/server/connection_spec.rb
 - spec/mongo/server/description/features_spec.rb
+- spec/mongo/server/description/inspector/description_changed_spec.rb
 - spec/mongo/server/description/inspector/primary_elected_spec.rb
-- spec/mongo/server/description/inspector/server_added_spec.rb
-- spec/mongo/server/description/inspector/server_removed_spec.rb
 - spec/mongo/server/description_spec.rb
 - spec/mongo/server/monitor_spec.rb
 - spec/mongo/server_discovery_and_monitoring_spec.rb
@@ -393,6 +393,7 @@ files:
 - spec/support/sdam/sharded/multiple_mongoses.yml
 - spec/support/sdam/sharded/non_mongos_removed.yml
 - spec/support/sdam/sharded/normalize_uri_case.yml
+- spec/support/sdam/sharded/single_mongos.yml
 - spec/support/sdam/single/direct_connection_external_ip.yml
 - spec/support/sdam/single/direct_connection_mongos.yml
 - spec/support/sdam/single/direct_connection_rsarbiter.yml
@@ -483,6 +484,7 @@ test_files:
 - spec/mongo/cluster/topology/replica_set_spec.rb
 - spec/mongo/cluster/topology/sharded_spec.rb
 - spec/mongo/cluster/topology/single_spec.rb
+- spec/mongo/cluster/topology/unknown_spec.rb
 - spec/mongo/cluster/topology_spec.rb
 - spec/mongo/cluster_spec.rb
 - spec/mongo/collection/view/aggregation_spec.rb
@@ -544,9 +546,8 @@ test_files:
 - spec/mongo/server/connection_pool_spec.rb
 - spec/mongo/server/connection_spec.rb
 - spec/mongo/server/description/features_spec.rb
+- spec/mongo/server/description/inspector/description_changed_spec.rb
 - spec/mongo/server/description/inspector/primary_elected_spec.rb
-- spec/mongo/server/description/inspector/server_added_spec.rb
-- spec/mongo/server/description/inspector/server_removed_spec.rb
 - spec/mongo/server/description_spec.rb
 - spec/mongo/server/monitor_spec.rb
 - spec/mongo/server_discovery_and_monitoring_spec.rb
@@ -617,6 +618,7 @@ test_files:
 - spec/support/sdam/sharded/multiple_mongoses.yml
 - spec/support/sdam/sharded/non_mongos_removed.yml
 - spec/support/sdam/sharded/normalize_uri_case.yml
+- spec/support/sdam/sharded/single_mongos.yml
 - spec/support/sdam/single/direct_connection_external_ip.yml
 - spec/support/sdam/single/direct_connection_mongos.yml
 - spec/support/sdam/single/direct_connection_rsarbiter.yml