mongo 2.2.7 → 2.3.0

data/lib/mongo/server_selector/primary.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/server_selector/primary_preferred.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/server_selector/secondary.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/server_selector/secondary_preferred.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/server_selector/selectable.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -37,7 +37,8 @@ module Mongo
       #
       # @since 2.0.0
       def ==(other)
-        name == other.name && tag_sets == other.tag_sets
+        name == other.name &&
+          tag_sets == other.tag_sets
       end
 
       # Initialize the server selector.
@@ -50,9 +51,6 @@ module Mongo
       #
       # @param [ Hash ] options The server preference options.
       #
-      # @option options [ Integer ] :server_selection_timeout The timeout in seconds
-      #   for selecting a server.
-      #
       # @option options [ Integer ] :local_threshold The local threshold boundary for
       #  nearest selection in seconds.
       #
@@ -76,8 +74,7 @@ module Mongo
       #
       # @since 2.2.0
       def inspect
-        "#<#{self.class.name}:0x#{object_id} tag_sets=#{tag_sets.inspect} " +
-        "server_selection_timeout=#{server_selection_timeout} local_threshold=#{local_threshold}>"
+        "#<#{self.class.name}:0x#{object_id} tag_sets=#{tag_sets.inspect}>"
       end
 
       # Select a server from eligible candidates.
@@ -91,6 +88,8 @@ module Mongo
       #
       # @since 2.0.0
       def select_server(cluster, ping = true)
+        @local_threshold = cluster.options[:local_threshold] || LOCAL_THRESHOLD
+        @server_selection_timeout = cluster.options[:server_selection_timeout] || SERVER_SELECTION_TIMEOUT
         deadline = Time.now + server_selection_timeout
         while (deadline - Time.now) > 0
           servers = candidates(cluster)
@@ -117,6 +116,9 @@ module Mongo
       # @return [ Float ] The timeout.
       #
       # @since 2.0.0
+      #
+      # @deprecated This setting is now taken from the cluster options when a server is selected.
+      #   Will be removed in 3.0.
       def server_selection_timeout
         @server_selection_timeout ||=
           (options[:server_selection_timeout] || ServerSelector::SERVER_SELECTION_TIMEOUT)
@@ -130,6 +132,9 @@ module Mongo
       # @return [ Float ] The local threshold.
       #
       # @since 2.0.0
+      #
+      # @deprecated This setting is now taken from the cluster options when a server is selected.
+      #   Will be removed in 3.0.
       def local_threshold
         @local_threshold ||= (options[:local_threshold] || ServerSelector::LOCAL_THRESHOLD)
       end

data/lib/mongo/socket.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/socket/ssl.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/socket/tcp.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/socket/unix.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/uri.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.

data/lib/mongo/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 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,5 +17,5 @@ module Mongo
   # The current version of the driver.
   #
   # @since 2.0.0
-  VERSION = '2.2.7'.freeze
+  VERSION = '2.3.0'.freeze
 end

data/lib/mongo/write_concern/acknowledged.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.

data/lib/mongo/write_concern/normalizable.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.

data/lib/mongo/write_concern/unacknowledged.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.

data/mongo.gemspec

@@ -30,5 +30,5 @@ Gem::Specification.new do |s|
   s.has_rdoc          = 'yard'
   s.bindir            = 'bin'
 
-  s.add_dependency 'bson', '~> 4.0'
+  s.add_dependency 'bson', '~> 4.1'
 end

data/spec/mongo/client_spec.rb

@@ -411,8 +411,8 @@ describe Mongo::Client do
         expect(preference).to be_a(Mongo::ServerSelector::Primary)
       end
 
-      it 'passes the options to the read preference' do
-        expect(preference.options[:server_selection_timeout]).to eq(2)
+      it 'passes the options to the cluster' do
+        expect(client.cluster.options[:server_selection_timeout]).to eq(2)
       end
     end
 

data/spec/mongo/cluster/cursor_reaper_spec.rb

@@ -0,0 +1,216 @@
+require 'spec_helper'
+
+describe Mongo::Cluster::CursorReaper do
+
+  after do
+    authorized_collection.delete_many
+  end
+
+  let(:reaper) do
+    described_class.new
+  end
+
+  let(:active_cursors) do
+    reaper.instance_variable_get(:@active_cursors)
+  end
+
+  describe '#intialize' do
+
+    it 'initializes a hash for servers and their kill cursors ops' do
+      expect(reaper.instance_variable_get(:@to_kill)).to be_a(Hash)
+    end
+
+    it 'initializes a set for the list of active cursors' do
+      expect(reaper.instance_variable_get(:@active_cursors)).to be_a(Set)
+    end
+  end
+
+  describe '#run' do
+
+    it 'starts a thread calling #kill_cursors' do
+      reaper.run!
+      expect(reaper.instance_variable_get(:@thread)).to be_a(Thread)
+    end
+
+    context 'when run is called more than once' do
+
+      let!(:reaper_thread) do
+        reaper.run!
+        reaper.instance_variable_get(:@reaper)
+      end
+
+      it 'only starts a thread once' do
+        reaper.run!
+        expect(reaper.instance_variable_get(:@reaper)).to be(reaper_thread)
+      end
+    end
+
+    context 'when there are ops in the list to execute' do
+
+      let(:server) { double('server') }
+      let(:cursor_id) { 1 }
+      let(:op_spec_1) { double('op_spec_1') }
+      let(:op_spec_2) { double('op_spec_2') }
+      let(:to_kill) { reaper.instance_variable_get(:@to_kill)}
+
+      before do
+        reaper.register_cursor(cursor_id)
+        reaper.schedule_kill_cursor(cursor_id, op_spec_1, server)
+        reaper.run!
+        sleep(Mongo::Cluster::CursorReaper::FREQUENCY + 1)
+      end
+
+      it 'executes the ops in the thread' do
+        expect(reaper.instance_variable_get(:@to_kill).size).to eq(0)
+      end
+    end
+  end
+
+  describe '#schedule_kill_cursor' do
+
+    let(:server) { double('server') }
+    let(:cursor_id) { 1 }
+    let(:op_spec_1) { double('op_spec_1') }
+    let(:op_spec_2) { double('op_spec_2') }
+    let(:to_kill) { reaper.instance_variable_get(:@to_kill)}
+
+    context 'when the cursor is on the list of active cursors' do
+
+      before do
+        reaper.register_cursor(cursor_id)
+      end
+
+      context 'when there is not a list already for the server' do
+
+        before do
+          reaper.schedule_kill_cursor(cursor_id, op_spec_1, server)
+        end
+
+        it 'initializes the list of op specs to a set' do
+          expect(to_kill.keys).to eq([ server ])
+          expect(to_kill[server]).to eq(Set.new([op_spec_1]))
+        end
+      end
+
+      context 'when there is a list of ops already for the server' do
+
+        before do
+          reaper.schedule_kill_cursor(cursor_id, op_spec_1, server)
+          reaper.schedule_kill_cursor(cursor_id, op_spec_2, server)
+        end
+
+        it 'adds the op to the server list' do
+          expect(to_kill.keys).to eq([ server ])
+          expect(to_kill[server]).to contain_exactly(op_spec_1, op_spec_2)
+        end
+
+        context 'when the same op is added more than once' do
+
+          before do
+            reaper.schedule_kill_cursor(cursor_id, op_spec_2, server)
+          end
+
+          it 'does not allow duplicates ops for a server' do
+            expect(to_kill.keys).to eq([ server ])
+            expect(to_kill[server]).to contain_exactly(op_spec_1, op_spec_2)
+          end
+        end
+      end
+    end
+
+    context 'when the cursor is not on the list of active cursors' do
+
+      before do
+        reaper.schedule_kill_cursor(cursor_id, op_spec_1, server)
+      end
+
+      it 'does not add the kill cursors op spec to the list' do
+        expect(to_kill).to eq({})
+      end
+    end
+  end
+
+  describe '#register_cursor' do
+
+    before do
+      reaper.register_cursor(cursor_id)
+    end
+
+    context 'when the cursor id is nil' do
+
+      let(:cursor_id) do
+        nil
+      end
+
+      it 'does not register the cursor' do
+        expect(active_cursors.size).to be(0)
+      end
+    end
+
+    context 'when the cursor id is 0' do
+
+      let(:cursor_id) do
+        0
+      end
+
+      it 'does not register the cursor' do
+        expect(active_cursors.size).to be(0)
+      end
+    end
+
+    context 'when the cursor id is a valid id' do
+
+      let(:cursor_id) do
+        2
+      end
+
+      it 'registers the cursor id as active' do
+        expect(active_cursors).to eq(Set.new([2]))
+      end
+    end
+  end
+
+  describe '#unregister_cursor' do
+
+    context 'when the cursor id is in the active cursors list' do
+
+      before do
+        reaper.register_cursor(2)
+        reaper.unregister_cursor(2)
+      end
+
+      it 'removes the cursor id' do
+        expect(active_cursors.size).to eq(0)
+      end
+    end
+  end
+
+  describe '#stop!' do
+
+    let(:thread) do
+      reaper.run!
+      reaper.stop!
+      sleep(0.5)
+      reaper.instance_variable_get(:@thread)
+    end
+
+    it 'stops the thread from running' do
+      expect(thread.alive?).to be(false)
+    end
+  end
+
+  describe '#restart!' do
+
+    let(:thread) do
+      reaper.run!
+      reaper.stop!
+      sleep(0.5)
+      reaper.restart!
+      reaper.instance_variable_get(:@thread)
+    end
+
+    it 'restarts the thread' do
+      expect(thread.alive?).to be(true)
+    end
+  end
+end

data/spec/mongo/cluster_spec.rb

@@ -62,7 +62,7 @@ describe Mongo::Cluster do
   describe '#inspect' do
 
     let(:preference) do
-      Mongo::ServerSelector.get
+      Mongo::ServerSelector.get(ServerSelector::PRIMARY)
     end
 
     it 'displays the cluster seeds and topology' do
@@ -74,7 +74,7 @@ describe Mongo::Cluster do
   describe '#replica_set_name' do
 
     let(:preference) do
-      Mongo::ServerSelector.get
+      Mongo::ServerSelector.get(ServerSelector::PRIMARY)
     end
 
     context 'when the option is provided' do
@@ -107,7 +107,7 @@ describe Mongo::Cluster do
   describe '#scan!' do
 
     let(:preference) do
-      Mongo::ServerSelector.get
+      Mongo::ServerSelector.get(ServerSelector::PRIMARY)
     end
 
     let(:known_servers) do
@@ -223,26 +223,36 @@ describe Mongo::Cluster do
       cluster.instance_variable_get(:@servers)
     end
 
+    let(:cursor_reaper) do
+      cluster.instance_variable_get(:@cursor_reaper)
+    end
+
     before do
       known_servers.each do |server|
         expect(server).to receive(:disconnect!).and_call_original
       end
+      expect(cursor_reaper).to receive(:stop!).and_call_original
     end
 
-    it 'disconnects each server and returns true' do
+    it 'disconnects each server and the cursor reaper and returns true' do
       expect(cluster.disconnect!).to be(true)
     end
   end
 
   describe '#reconnect!' do
 
+    let(:cursor_reaper) do
+      cluster.instance_variable_get(:@cursor_reaper)
+    end
+
     before do
       cluster.servers.each do |server|
         expect(server).to receive(:reconnect!).and_call_original
       end
+      expect(cursor_reaper).to receive(:restart!).and_call_original
     end
 
-    it 'reconnects each server and returns true' do
+    it 'reconnects each server and the cursor reaper and returns true' do
       expect(cluster.reconnect!).to be(true)
     end
   end
@@ -432,4 +442,25 @@ describe Mongo::Cluster do
       end
     end
   end
+
+  describe '#next_primary' do
+
+    let(:cluster) do
+      authorized_client.cluster
+    end
+
+    let(:primary_candidates) do
+      if cluster.single?
+        cluster.servers
+      elsif cluster.sharded?
+        cluster.servers
+      else
+        cluster.servers.select { |s| s.primary? }
+      end
+    end
+
+    it 'always returns the primary, mongos, or standalone' do
+      expect(primary_candidates).to include(cluster.next_primary)
+    end
+  end
 end