mongo 2.0.5 → 2.0.6

data/lib/mongo/server/description/inspector.rb

@@ -13,8 +13,8 @@
 # limitations under the License.
 
 require 'mongo/server/description/inspector/primary_elected'
-require 'mongo/server/description/inspector/server_added'
-require 'mongo/server/description/inspector/server_removed'
+require 'mongo/server/description/inspector/description_changed'
+require 'mongo/server/description/inspector/standalone_discovered'
 
 module Mongo
   class Server
@@ -32,9 +32,9 @@ module Mongo
         #
         # @since 2.0.0
         INSPECTORS = [
-          Inspector::PrimaryElected,
-          Inspector::ServerAdded,
-          Inspector::ServerRemoved
+            Inspector::StandaloneDiscovered,
+            Inspector::DescriptionChanged,
+            Inspector::PrimaryElected
         ].freeze
 
         # @return [ Array ] inspectors The description inspectors.

data/lib/mongo/server/description/inspector/{server_added.rb → description_changed.rb}

@@ -21,7 +21,7 @@ module Mongo
         # added to the cluster.
         #
         # @since 2.0.0
-        class ServerAdded
+        class DescriptionChanged
           include Event::Publisher
 
           # Instantiate the server added inspection.
@@ -46,10 +46,8 @@ module Mongo
           #
           # @since 2.0.0
           def run(description, updated)
-            updated.servers.each do |host|
-              unless description.servers.include?(host)
-                publish(Event::SERVER_ADDED, host)
-              end
+            unless description == updated
+              publish(Event::DESCRIPTION_CHANGED, updated)
             end
           end
         end

data/lib/mongo/server/description/inspector/{server_removed.rb → standalone_discovered.rb}

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2015 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.
@@ -17,39 +17,36 @@ module Mongo
     class Description
       class Inspector
 
-        # Handles inspecting the result of an ismaster command for servers
-        # that were removed from the cluster.
+        # Handles notifying the cluster that a standalone was discovered.
         #
-        # @since 2.0.0
-        class ServerRemoved
+        # @since 2.0.6
+        class StandaloneDiscovered
           include Event::Publisher
 
-          # Instantiate the server removed inspection.
+          # Instantiate the standalone discovered inspection.
           #
           # @example Instantiate the inspection.
-          #   ServerRemoved.new(listeners)
+          #   StandaloneDiscovered.new(listeners)
           #
           # @param [ Event::Listeners ] event_listeners The event listeners.
           #
-          # @since 2.0.0
+          # @since 2.0.6
           def initialize(event_listeners)
             @event_listeners = event_listeners
           end
 
-          # Run the server added inspection.
+          # Run the standalone discovered inspection.
           #
           # @example Run the inspection.
-          #   ServerAdded.run(description, {})
+          #   StandaloneDiscovered.run(description, {})
           #
           # @param [ Description ] description The server description.
           # @param [ Description ] updated The updated description.
           #
-          # @since 2.0.0
+          # @since 2.0.6
           def run(description, updated)
-            description.hosts.each do |host|
-              if updated.primary? && !updated.hosts.include?(host)
-                publish(Event::SERVER_REMOVED, host)
-              end
+            if !description.standalone? && updated.standalone?
+              publish(Event::STANDALONE_DISCOVERED, updated)
             end
           end
         end

data/lib/mongo/version.rb

@@ -17,5 +17,5 @@ module Mongo
   # The current version of the driver.
   #
   # @since 2.0.0
-  VERSION = '2.0.5'.freeze
+  VERSION = '2.0.6'.freeze
 end

data/spec/mongo/auth/cr_spec.rb

@@ -7,7 +7,7 @@ describe Mongo::Auth::CR do
   end
 
   let(:server) do
-    Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
+    Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
   end
 
   let(:connection) do

data/spec/mongo/auth/ldap_spec.rb

@@ -7,7 +7,7 @@ describe Mongo::Auth::LDAP do
   end
 
   let(:server) do
-    Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
+    Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
   end
 
   let(:connection) do

data/spec/mongo/auth/scram_spec.rb

@@ -7,7 +7,7 @@ describe Mongo::Auth::SCRAM do
   end
 
   let(:server) do
-    Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
+    Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
   end
 
   let(:connection) do

data/spec/mongo/auth/x509_spec.rb

@@ -7,7 +7,7 @@ describe Mongo::Auth::X509 do
   end
 
   let(:server) do
-    Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
+    Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
   end
 
   let(:connection) do

data/spec/mongo/client_spec.rb

@@ -412,6 +412,10 @@ describe Mongo::Client do
       it 'returns the new client' do
         expect(client.send(:database).name).to eq('ruby-driver')
       end
+
+      it 'keeps the same cluster' do
+        expect(database.cluster).to equal(client.cluster)
+      end
     end
 
     context 'when provided a string' do

data/spec/mongo/cluster/topology/replica_set_spec.rb

@@ -9,19 +9,19 @@ describe Mongo::Cluster::Topology::ReplicaSet do
   describe '#servers' do
 
     let(:mongos) do
-      Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
+      Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
     end
 
     let(:standalone) do
-      Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
+      Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
     end
 
     let(:replica_set) do
-      Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
+      Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
     end
 
     let(:replica_set_two) do
-      Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
+      Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
     end
 
     let(:mongos_description) do
@@ -98,4 +98,254 @@ describe Mongo::Cluster::Topology::ReplicaSet do
       expect(described_class.new({})).to_not be_single
     end
   end
+
+  describe '#add_hosts?' do
+
+    let(:primary) do
+      Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
+    end
+
+    let(:secondary) do
+      Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
+    end
+
+    let(:primary_description) do
+      Mongo::Server::Description.new(address, { 'ismaster' => true, 'setName' => 'testing' })
+    end
+
+    let(:secondary_description) do
+      Mongo::Server::Description.new(address, { 'ismaster' => false, 'secondary' => true,
+                                                'setName' => 'testing' })
+    end
+
+    let(:topology) do
+      described_class.new(:replica_set => 'testing')
+    end
+
+    before do
+      primary.monitor.instance_variable_set(:@description, primary_description)
+      secondary.monitor.instance_variable_set(:@description, secondary_description)
+    end
+
+    context 'when the list of servers does not include a primary' do
+
+      let(:servers) do
+        [ secondary ]
+      end
+
+      context 'when the description is a member of the replica set' do
+
+        let(:description) do
+          double('description').tap do |d|
+            allow(d).to receive(:replica_set_member?).and_return(true)
+            allow(d).to receive(:replica_set_name).and_return('testing')
+          end
+        end
+
+        it 'returns true' do
+          expect(topology.add_hosts?(description, servers)).to eq(true)
+        end
+      end
+
+      context 'when the description is not a member of the replica set' do
+
+        let(:description) do
+          double('description').tap do |d|
+            allow(d).to receive(:replica_set_member?).and_return(false)
+          end
+        end
+
+        it 'returns false' do
+          expect(topology.add_hosts?(description, servers)).to eq(false)
+        end
+      end
+    end
+
+    context 'when the list of servers has a primary' do
+
+      let(:servers) do
+        [ primary, secondary ]
+      end
+
+      let(:description) do
+        double('description').tap do |d|
+          allow(d).to receive(:replica_set_member?).and_return(true)
+          allow(d).to receive(:replica_set_name).and_return('testing')
+        end
+      end
+
+      it 'returns false' do
+        expect(topology.add_hosts?(description, servers)).to eq(false)
+      end
+    end
+  end
+
+  describe '#remove_hosts?' do
+
+    let(:primary) do
+      Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
+    end
+
+    let(:primary_description) do
+      Mongo::Server::Description.new(address, { 'ismaster' => true, 'setName' => 'testing' })
+    end
+
+    let(:topology) do
+      described_class.new(:replica_set => 'testing')
+    end
+
+    before do
+      primary.monitor.instance_variable_set(:@description, primary_description)
+    end
+
+    context 'when the description has an empty config' do
+
+      let(:description) do
+        double('description').tap do |d|
+          allow(d).to receive(:config).and_return({})
+        end
+      end
+
+      it 'returns false' do
+        expect(topology.remove_hosts?(description)).to eq(false)
+      end
+    end
+
+    context 'when the description is from a primary' do
+
+      let(:description) do
+        double('description').tap do |d|
+          allow(d).to receive(:config).and_return({ 'ismaster' => true })
+          allow(d).to receive(:primary?).and_return(true)
+        end
+      end
+
+      it 'returns true' do
+        expect(topology.remove_hosts?(description)).to eq(true)
+      end
+    end
+
+    context 'when the description has an empty hosts list' do
+
+      let(:description) do
+        double('description').tap do |d|
+          allow(d).to receive(:config).and_return({ 'ismaster' => true })
+          allow(d).to receive(:primary?).and_return(false)
+          allow(d).to receive(:hosts).and_return([])
+        end
+      end
+
+      it 'returns true' do
+        expect(topology.remove_hosts?(description)).to eq(true)
+      end
+    end
+
+    context 'when the description is not from the replica set' do
+
+      let(:description) do
+        double('description').tap do |d|
+          allow(d).to receive(:config).and_return({ 'ismaster' => true })
+          allow(d).to receive(:primary?).and_return(false)
+          allow(d).to receive(:hosts).and_return([ primary ])
+          allow(d).to receive(:replica_set_name).and_return('test')
+          allow(d).to receive(:replica_set_member?).and_return(true)
+        end
+      end
+
+      it 'returns true' do
+        expect(topology.remove_hosts?(description)).to eq(true)
+      end
+    end
+
+  end
+
+  describe '#remove_server?' do
+
+    let(:secondary) do
+      Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
+    end
+
+    let(:secondary_description) do
+      Mongo::Server::Description.new(address, { 'ismaster' => false, 'secondary' => true,
+                                                'setName' => 'test' })
+    end
+
+    let(:topology) do
+      described_class.new(:replica_set => 'testing')
+    end
+
+    before do
+      secondary.monitor.instance_variable_set(:@description, secondary_description)
+    end
+
+    context 'when the description is from a server that should itself be removed' do
+
+      let(:description) do
+        double('description').tap do |d|
+          allow(d).to receive(:config).and_return({ 'setName' => 'test' })
+          allow(d).to receive(:replica_set_member?).and_return(true)
+          allow(d).to receive(:replica_set_name).and_return('test')
+          allow(d).to receive(:is_server?).and_return(true)
+          allow(d).to receive(:ghost?).and_return(false)
+        end
+      end
+
+      it 'returns true' do
+        expect(topology.remove_server?(description, secondary)).to eq(true)
+      end
+    end
+
+    context 'when the description is a member of the replica set' do
+
+      context 'when the description includes the server in question' do
+
+        let(:description) do
+          double('description').tap do |d|
+            allow(d).to receive(:config).and_return({ 'setName' => 'testing' })
+            allow(d).to receive(:replica_set_member?).and_return(true)
+            allow(d).to receive(:replica_set_name).and_return('testing')
+            allow(d).to receive(:lists_server?).and_return(true)
+          end
+        end
+
+        it 'returns false' do
+          expect(topology.remove_server?(description, secondary)).to eq(false)
+        end
+      end
+
+      context 'when the description does not include the server in question' do
+
+        let(:description) do
+          double('description').tap do |d|
+            allow(d).to receive(:config).and_return({ 'setName' => 'testing' })
+            allow(d).to receive(:replica_set_member?).and_return(true)
+            allow(d).to receive(:replica_set_name).and_return('testing')
+            allow(d).to receive(:is_server?).and_return(false)
+            allow(d).to receive(:lists_server?).and_return(false)
+          end
+        end
+
+        it 'returns true' do
+          expect(topology.remove_server?(description, secondary)).to eq(true)
+        end
+      end
+    end
+
+    context 'when the description is not a member of the replica set' do
+
+      let(:description) do
+        double('description').tap do |d|
+          allow(d).to receive(:config).and_return({ 'setName' => 'test' })
+          allow(d).to receive(:replica_set_member?).and_return(true)
+          allow(d).to receive(:replica_set_name).and_return('test')
+          allow(d).to receive(:is_server?).and_return(false)
+        end
+      end
+
+      it 'returns false' do
+        expect(topology.remove_server?(description, secondary)).to eq(false)
+      end
+    end
+
+  end
 end

data/spec/mongo/cluster/topology/sharded_spec.rb

@@ -10,31 +10,32 @@ describe Mongo::Cluster::Topology::Sharded do
     described_class.new({})
   end
 
-  describe '.servers' do
 
-    let(:mongos) do
-      Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
-    end
+  let(:mongos) do
+    Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
+  end
 
-    let(:standalone) do
-      Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
-    end
+  let(:standalone) do
+    Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
+  end
 
-    let(:replica_set) do
-      Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
-    end
+  let(:replica_set) do
+    Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
+  end
 
-    let(:mongos_description) do
-      Mongo::Server::Description.new(address, { 'msg' => 'isdbgrid' })
-    end
+  let(:mongos_description) do
+    Mongo::Server::Description.new(address, { 'msg' => 'isdbgrid' })
+  end
 
-    let(:standalone_description) do
-      Mongo::Server::Description.new(address, { 'ismaster' => true })
-    end
+  let(:standalone_description) do
+    Mongo::Server::Description.new(address, { 'ismaster' => true })
+  end
 
-    let(:replica_set_description) do
-      Mongo::Server::Description.new(address, { 'ismaster' => true, 'setName' => 'testing' })
-    end
+  let(:replica_set_description) do
+    Mongo::Server::Description.new(address, { 'ismaster' => true, 'setName' => 'testing', 'ok' => 1 })
+  end
+
+  describe '.servers' do
 
     before do
       mongos.monitor.instance_variable_set(:@description, mongos_description)
@@ -71,4 +72,54 @@ describe Mongo::Cluster::Topology::Sharded do
       expect(topology).to_not be_single
     end
   end
+
+  describe '#add_hosts?' do
+
+    it 'returns false' do
+      expect(topology.add_hosts?(double('description'), [])).to eq(false)
+    end
+  end
+
+  describe '#remove_hosts?' do
+
+    it 'returns true' do
+      expect(topology.remove_hosts?(double('description'))).to eq(true)
+    end
+  end
+
+  describe '#remove_server?' do
+
+    before do
+      mongos.monitor.instance_variable_set(:@description, mongos_description)
+      replica_set.monitor.instance_variable_set(:@description, replica_set_description)
+    end
+
+    context 'when the server itself should be removed' do
+
+      let(:description) do
+        double('description').tap do |d|
+          allow(d).to receive(:mongos?).and_return(false)
+          allow(d).to receive(:is_server?).and_return(true)
+        end
+      end
+
+      it 'returns true' do
+        expect(topology.remove_server?(description, mongos)).to eq(true)
+      end
+    end
+
+    context 'when the server is neither a mongos nor an unknown' do
+
+      let(:description) do
+        double('description').tap do |d|
+          allow(d).to receive(:mongos?).and_return(true)
+          allow(d).to receive(:is_server?).and_return(false)
+        end
+      end
+
+      it 'returns true' do
+        expect(topology.remove_server?(description, replica_set)).to eq(true)
+      end
+    end
+  end
 end