mongo 2.4.0.rc1 → 2.4.0

data/spec/support/server_discovery_and_monitoring.rb

@@ -150,6 +150,9 @@ module Mongo
     # @since 2.0.0
     class Outcome
 
+      # @return [ Array ] events The expected events.
+      attr_reader :events
+
       # @return [ Hash ] servers The expecations for
       #   server states.
       attr_reader :servers
@@ -169,18 +172,48 @@ module Mongo
       #
       # @since 2.0.0
       def initialize(outcome)
-        @servers = process_servers(outcome['servers'])
+        @servers = process_servers(outcome['servers']) if outcome['servers']
         @set_name = outcome['setName']
         @topology_type = outcome['topologyType']
+        @events = process_events(outcome['events']) if outcome['events']
       end
 
       private
 
+      def process_events(events)
+        events.map do |event|
+          Event.new(event.keys.first, event.values.first)
+        end
+      end
+
       def process_servers(servers)
         servers.each do |s|
           SDAM::convert_election_ids([ s[1] ])
         end
       end
     end
+
+    class Event
+
+      MAPPINGS = {
+        'server_closed_event' => Mongo::Monitoring::Event::ServerClosed,
+        'server_description_changed_event' => Mongo::Monitoring::Event::ServerDescriptionChanged,
+        'server_opening_event' => Mongo::Monitoring::Event::ServerOpening,
+        'topology_description_changed_event' => Mongo::Monitoring::Event::TopologyChanged,
+        'topology_opening_event' => Mongo::Monitoring::Event::TopologyOpening
+      }
+
+      attr_reader :name
+      attr_reader :data
+
+      def initialize(name, data)
+        @name = name
+        @data = data
+      end
+
+      def expected
+        MAPPINGS.fetch(name)
+      end
+    end
   end
 end

data/spec/support/server_selection.rb

@@ -49,11 +49,6 @@ module Mongo
         # @since 2.4.0
         attr_reader :max_staleness
 
-        # @return [ Array<Hash> ] candidate_servers The candidate servers.
-        #
-        # @since 2.0.0
-        attr_reader :candidate_servers
-
         # @return [ Array<Hash> ] eligible_servers The eligible servers before the latency
         #   window is taken into account.
         #
@@ -84,13 +79,13 @@ module Mongo
           @test = YAML.load(ERB.new(file.read).result)
           file.close
           @description = "#{@test['topology_description']['type']}: #{File.basename(file)}"
-          @heartbeat_frequency = @test['heartbeatFrequencyMS']
+          @heartbeat_frequency = @test['heartbeatFrequencyMS'] / 1000 if @test['heartbeatFrequencyMS']
           @read_preference = @test['read_preference']
           @read_preference['mode'] = READ_PREFERENCES[@read_preference['mode']]
-          @max_staleness = @read_preference['maxStalenessMS']
+          @max_staleness = @read_preference['maxStalenessSeconds']
           @candidate_servers = @test['topology_description']['servers']
-          @suitable_servers = @test['suitable_servers']
-          @in_latency_window = @test['in_latency_window']
+          @suitable_servers = @test['suitable_servers'] || []
+          @in_latency_window = @test['in_latency_window'] || []
           @type = TOPOLOGY_TYPES[@test['topology_description']['type']]
         end
 
@@ -127,8 +122,7 @@ module Mongo
         #
         # @since 2.4.0
         def invalid_max_staleness?
-          @test['error'] ||
-            candidate_servers.any? { |server| server['maxWireVersion'] < 5 }
+          @test['error']
         end
 
         # The subset of suitable servers that falls within the allowable latency
@@ -149,6 +143,15 @@ module Mongo
           @in_latency_window
         end
 
+        # The servers a topology would return as candidates for selection.
+        #
+        # @return [ Array<Hash> ] candidate_servers The candidate servers.
+        #
+        # @since 2.0.0
+        def candidate_servers
+          @candidate_servers.select { |s| s['type'] != 'Unknown' }
+        end
+
         private
 
         def primary

data/spec/support/shared/server_selector.rb

@@ -35,6 +35,12 @@ shared_context 'server selector' do
   let(:secondary) { make_server(:secondary) }
   let(:options) { { :mode => name, :tag_sets => tag_sets, max_staleness: max_staleness } }
   let(:selector) { described_class.new(options) }
+  let(:monitoring) do
+    Mongo::Monitoring.new(monitoring: false)
+  end
+  let(:topology) do
+    double('topology')
+  end
 
   before(:all) do
     module Mongo

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo
 version: !ruby/object:Gem::Version
-  version: 2.4.0.rc1
+  version: 2.4.0
 platform: ruby
 authors:
 - Tyler Brock
@@ -32,7 +32,7 @@ cert_chain:
   EhIn2f8suSc9QAqYt7w4T+PMtjxWTVcXs+Uy2PbDtjhtEBz6ZsP6YSsOpJbrCjCV
   wZtXjpRUvWz86V5vjhHCTE8fqfEb85aeDwUCckPzpio=
   -----END CERTIFICATE-----
-date: 2016-11-01 00:00:00.000000000 Z
+date: 2016-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
@@ -40,14 +40,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc1
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc1
+        version: 4.2.0
 description: A Ruby driver for MongoDB
 email: mongodb-dev@googlegroups.com
 executables:
@@ -159,6 +159,7 @@ files:
 - lib/mongo/event.rb
 - lib/mongo/event/description_changed.rb
 - lib/mongo/event/listeners.rb
+- lib/mongo/event/member_discovered.rb
 - lib/mongo/event/primary_elected.rb
 - lib/mongo/event/publisher.rb
 - lib/mongo/event/standalone_discovered.rb
@@ -182,7 +183,19 @@ files:
 - lib/mongo/monitoring/event/command_started.rb
 - lib/mongo/monitoring/event/command_succeeded.rb
 - lib/mongo/monitoring/event/secure.rb
+- lib/mongo/monitoring/event/server_closed.rb
+- lib/mongo/monitoring/event/server_description_changed.rb
+- lib/mongo/monitoring/event/server_opening.rb
+- lib/mongo/monitoring/event/topology_changed.rb
+- lib/mongo/monitoring/event/topology_closed.rb
+- lib/mongo/monitoring/event/topology_opening.rb
 - lib/mongo/monitoring/publishable.rb
+- lib/mongo/monitoring/sdam_log_subscriber.rb
+- lib/mongo/monitoring/server_closed_log_subscriber.rb
+- lib/mongo/monitoring/server_description_changed_log_subscriber.rb
+- lib/mongo/monitoring/server_opening_log_subscriber.rb
+- lib/mongo/monitoring/topology_changed_log_subscriber.rb
+- lib/mongo/monitoring/topology_opening_log_subscriber.rb
 - lib/mongo/operation.rb
 - lib/mongo/operation/commands.rb
 - lib/mongo/operation/commands/aggregate.rb
@@ -281,6 +294,7 @@ files:
 - 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/member_discovered.rb
 - lib/mongo/server/description/inspector/primary_elected.rb
 - lib/mongo/server/description/inspector/standalone_discovered.rb
 - lib/mongo/server/monitor.rb
@@ -314,6 +328,7 @@ files:
 - spec/mongo/auth/scram_spec.rb
 - spec/mongo/auth/user/view_spec.rb
 - spec/mongo/auth/user_spec.rb
+- spec/mongo/auth/x509/conversation_spec.rb
 - spec/mongo/auth/x509_spec.rb
 - spec/mongo/auth_spec.rb
 - spec/mongo/bson_spec.rb
@@ -404,6 +419,8 @@ files:
 - spec/mongo/protocol/reply_spec.rb
 - spec/mongo/protocol/update_spec.rb
 - spec/mongo/retryable_spec.rb
+- spec/mongo/sdam_monitoring_spec.rb
+- spec/mongo/sdam_spec.rb
 - spec/mongo/server/connection_pool/queue_spec.rb
 - spec/mongo/server/connection_pool_spec.rb
 - spec/mongo/server/connection_spec.rb
@@ -412,7 +429,6 @@ files:
 - spec/mongo/server/description/inspector/primary_elected_spec.rb
 - spec/mongo/server/description_spec.rb
 - spec/mongo/server/monitor_spec.rb
-- spec/mongo/server_discovery_and_monitoring_spec.rb
 - spec/mongo/server_selection_rtt_spec.rb
 - spec/mongo/server_selection_spec.rb
 - spec/mongo/server_selector/nearest_spec.rb
@@ -501,14 +517,18 @@ files:
 - spec/support/max_staleness/ReplicaSetNoPrimary/LastUpdateTime.yml
 - spec/support/max_staleness/ReplicaSetNoPrimary/Nearest.yml
 - spec/support/max_staleness/ReplicaSetNoPrimary/Nearest2.yml
+- spec/support/max_staleness/ReplicaSetNoPrimary/NoKnownServers.yml
 - spec/support/max_staleness/ReplicaSetNoPrimary/PrimaryPreferred.yml
 - spec/support/max_staleness/ReplicaSetNoPrimary/PrimaryPreferred_tags.yml
 - spec/support/max_staleness/ReplicaSetNoPrimary/Secondary.yml
 - spec/support/max_staleness/ReplicaSetNoPrimary/SecondaryPreferred.yml
 - spec/support/max_staleness/ReplicaSetNoPrimary/SecondaryPreferred_tags.yml
+- spec/support/max_staleness/ReplicaSetNoPrimary/ZeroMaxStaleness.yml
 - spec/support/max_staleness/ReplicaSetWithPrimary/DefaultNoMaxStaleness.yml
 - spec/support/max_staleness/ReplicaSetWithPrimary/Incompatible.yml
 - spec/support/max_staleness/ReplicaSetWithPrimary/LastUpdateTime.yml
+- spec/support/max_staleness/ReplicaSetWithPrimary/LongHeartbeat.yml
+- spec/support/max_staleness/ReplicaSetWithPrimary/LongHeartbeat2.yml
 - spec/support/max_staleness/ReplicaSetWithPrimary/MaxStalenessTooSmall.yml
 - spec/support/max_staleness/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.yml
 - spec/support/max_staleness/ReplicaSetWithPrimary/Nearest.yml
@@ -521,13 +541,12 @@ files:
 - spec/support/max_staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags2.yml
 - spec/support/max_staleness/ReplicaSetWithPrimary/Secondary_tags.yml
 - spec/support/max_staleness/ReplicaSetWithPrimary/Secondary_tags2.yml
-- spec/support/max_staleness/ReplicaSetWithPrimary/ShortHeartbeartShortMaxStaleness.yml
-- spec/support/max_staleness/ReplicaSetWithPrimary/ShortHeartbeartShortMaxStaleness2.yml
 - spec/support/max_staleness/ReplicaSetWithPrimary/ZeroMaxStaleness.yml
 - spec/support/max_staleness/Sharded/Incompatible.yml
 - spec/support/max_staleness/Sharded/SmallMaxStaleness.yml
 - spec/support/max_staleness/Single/Incompatible.yml
 - spec/support/max_staleness/Single/SmallMaxStaleness.yml
+- spec/support/max_staleness/Unknown/SmallMaxStaleness.yml
 - spec/support/sdam/rs/discover_arbiters.yml
 - spec/support/sdam/rs/discover_passives.yml
 - spec/support/sdam/rs/discover_primary.yml
@@ -581,6 +600,12 @@ files:
 - spec/support/sdam/single/not_ok_response.yml
 - spec/support/sdam/single/standalone_removed.yml
 - spec/support/sdam/single/unavailable_seed.yml
+- spec/support/sdam_monitoring.rb
+- spec/support/sdam_monitoring/replica_set_with_no_primary.yml
+- spec/support/sdam_monitoring/replica_set_with_primary.yml
+- spec/support/sdam_monitoring/replica_set_with_removal.yml
+- spec/support/sdam_monitoring/required_replica_set.yml
+- spec/support/sdam_monitoring/standalone.yml
 - spec/support/server_discovery_and_monitoring.rb
 - spec/support/server_selection.rb
 - spec/support/server_selection/rtt/first_value.yml
@@ -635,12 +660,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Ruby driver for MongoDB
@@ -656,6 +681,7 @@ test_files:
 - spec/mongo/auth/scram_spec.rb
 - spec/mongo/auth/user/view_spec.rb
 - spec/mongo/auth/user_spec.rb
+- spec/mongo/auth/x509/conversation_spec.rb
 - spec/mongo/auth/x509_spec.rb
 - spec/mongo/auth_spec.rb
 - spec/mongo/bson_spec.rb
@@ -746,6 +772,8 @@ test_files:
 - spec/mongo/protocol/reply_spec.rb
 - spec/mongo/protocol/update_spec.rb
 - spec/mongo/retryable_spec.rb
+- spec/mongo/sdam_monitoring_spec.rb
+- spec/mongo/sdam_spec.rb
 - spec/mongo/server/connection_pool/queue_spec.rb
 - spec/mongo/server/connection_pool_spec.rb
 - spec/mongo/server/connection_spec.rb
@@ -754,7 +782,6 @@ test_files:
 - spec/mongo/server/description/inspector/primary_elected_spec.rb
 - spec/mongo/server/description_spec.rb
 - spec/mongo/server/monitor_spec.rb
-- spec/mongo/server_discovery_and_monitoring_spec.rb
 - spec/mongo/server_selection_rtt_spec.rb
 - spec/mongo/server_selection_spec.rb
 - spec/mongo/server_selector/nearest_spec.rb
@@ -843,14 +870,18 @@ test_files:
 - spec/support/max_staleness/ReplicaSetNoPrimary/LastUpdateTime.yml
 - spec/support/max_staleness/ReplicaSetNoPrimary/Nearest.yml
 - spec/support/max_staleness/ReplicaSetNoPrimary/Nearest2.yml
+- spec/support/max_staleness/ReplicaSetNoPrimary/NoKnownServers.yml
 - spec/support/max_staleness/ReplicaSetNoPrimary/PrimaryPreferred.yml
 - spec/support/max_staleness/ReplicaSetNoPrimary/PrimaryPreferred_tags.yml
 - spec/support/max_staleness/ReplicaSetNoPrimary/Secondary.yml
 - spec/support/max_staleness/ReplicaSetNoPrimary/SecondaryPreferred.yml
 - spec/support/max_staleness/ReplicaSetNoPrimary/SecondaryPreferred_tags.yml
+- spec/support/max_staleness/ReplicaSetNoPrimary/ZeroMaxStaleness.yml
 - spec/support/max_staleness/ReplicaSetWithPrimary/DefaultNoMaxStaleness.yml
 - spec/support/max_staleness/ReplicaSetWithPrimary/Incompatible.yml
 - spec/support/max_staleness/ReplicaSetWithPrimary/LastUpdateTime.yml
+- spec/support/max_staleness/ReplicaSetWithPrimary/LongHeartbeat.yml
+- spec/support/max_staleness/ReplicaSetWithPrimary/LongHeartbeat2.yml
 - spec/support/max_staleness/ReplicaSetWithPrimary/MaxStalenessTooSmall.yml
 - spec/support/max_staleness/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.yml
 - spec/support/max_staleness/ReplicaSetWithPrimary/Nearest.yml
@@ -863,13 +894,12 @@ test_files:
 - spec/support/max_staleness/ReplicaSetWithPrimary/SecondaryPreferred.yml
 - spec/support/max_staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags.yml
 - spec/support/max_staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags2.yml
-- spec/support/max_staleness/ReplicaSetWithPrimary/ShortHeartbeartShortMaxStaleness.yml
-- spec/support/max_staleness/ReplicaSetWithPrimary/ShortHeartbeartShortMaxStaleness2.yml
 - spec/support/max_staleness/ReplicaSetWithPrimary/ZeroMaxStaleness.yml
 - spec/support/max_staleness/Sharded/Incompatible.yml
 - spec/support/max_staleness/Sharded/SmallMaxStaleness.yml
 - spec/support/max_staleness/Single/Incompatible.yml
 - spec/support/max_staleness/Single/SmallMaxStaleness.yml
+- spec/support/max_staleness/Unknown/SmallMaxStaleness.yml
 - spec/support/sdam/rs/discover_arbiters.yml
 - spec/support/sdam/rs/discover_passives.yml
 - spec/support/sdam/rs/discover_primary.yml
@@ -923,6 +953,12 @@ test_files:
 - spec/support/sdam/single/not_ok_response.yml
 - spec/support/sdam/single/standalone_removed.yml
 - spec/support/sdam/single/unavailable_seed.yml
+- spec/support/sdam_monitoring/replica_set_with_no_primary.yml
+- spec/support/sdam_monitoring/replica_set_with_primary.yml
+- spec/support/sdam_monitoring/replica_set_with_removal.yml
+- spec/support/sdam_monitoring/required_replica_set.yml
+- spec/support/sdam_monitoring/standalone.yml
+- spec/support/sdam_monitoring.rb
 - spec/support/server_discovery_and_monitoring.rb
 - spec/support/server_selection/rtt/first_value.yml
 - spec/support/server_selection/rtt/first_value_zero.yml

data/spec/mongo/server_discovery_and_monitoring_spec.rb

@@ -1,115 +0,0 @@
-require 'spec_helper'
-
-describe 'Server Discovery and Monitoring' do
-  include Mongo::SDAM
-
-  SERVER_DISCOVERY_TESTS.each do |file|
-
-    spec = Mongo::SDAM::Spec.new(file)
-
-    context(spec.description) do
-
-      before(:all) do
-
-        module Mongo
-          # We monkey-patch the server here, so the monitors do not run and no
-          # real TCP connection is attempted. Thus we can control the server
-          # descriptions per-phase.
-          #
-          # @since 2.0.0
-          class Server
-
-            alias :original_initialize :initialize
-            def initialize(address, cluster, monitoring, event_listeners, options = {})
-              @address = address
-              @cluster = cluster
-              @monitoring = monitoring
-              @options = options.freeze
-              @monitor = Monitor.new(address, event_listeners, options)
-            end
-
-            alias :original_disconnect! :disconnect!
-            def disconnect!; true; end
-          end
-        end
-
-        # Client is set as an instance variable inside the scope of the spec to
-        # retain its modifications across contexts/phases. Let is no good
-        # here as we have a clean slate for each context/phase.
-        @client = Mongo::Client.new(spec.uri_string)
-      end
-
-      after(:all) do
-        @client.close
-
-        # Return the server implementation to its original for the other
-        # tests in the suite.
-        module Mongo
-          class Server
-            alias :initialize :original_initialize
-            remove_method(:original_initialize)
-
-            alias :disconnect! :original_disconnect!
-            remove_method(:original_disconnect!)
-          end
-        end
-      end
-
-      spec.phases.each_with_index do |phase, index|
-
-        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.instance_variable_get(:@monitoring),
-                @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
-
-          it "sets the cluster replica set name to #{phase.outcome.set_name.inspect}" 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
-              expect(find_server(@client, uri)).to be_server_type(server['type'])
-            end
-
-            it "sets #{uri} replica set name to #{server['setName'].inspect}" do
-              expect(find_server(@client, uri).replica_set_name).to eq(server['setName'])
-            end
-          end
-        end
-      end
-    end
-  end
-end