mongo 2.9.1.rc0 → 2.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e682274ba299fe9da1e373641236dd929ad81784a68a8f873a0461343835980
-  data.tar.gz: 9b5aba8b96ee2a5d7c1cf3f0df73ca93de5ce0e921da3df2e45fb165d6a28bbd
+  metadata.gz: 1021b405443096b923a6d84d00500e95303517d8dff0d71bb48ecd6c2c7d25a5
+  data.tar.gz: feb30475f0b4ab34599d2cee2cc68fc6d8aa129c69519770140a323696c8c3b6
 SHA512:
-  metadata.gz: 7afd6d03c3c5c5691c5b34bab63a0deddb95d779bbaf1d80e011ade79856e65cc3677d77388a89cedfa9d56f70c528d88210e76aeff3b8d65b30026bee8cc5d6
-  data.tar.gz: 28f0da296a9852c66a14cc19c1578168ccd549f0f1e9a0c9a143fb109d7ae57ab74c84a90569415219c039840ca59145420cc8e10f0a04413b10638d00ad3217
+  metadata.gz: 859cb4a6d243af0e3cfbb73db9b430d74430327ef9b12471eff91cc8d04588379a6f22ba29ae441c2fcff57e4431196319a82795d4ef752d4c6e9fdfae623dd6
+  data.tar.gz: 256a9aed9e7460d025dee8df1b5890cd2dc4461577c4221dc3c93bf7f656869b7877a92f7e931d6edbd3cda1c217b51022e3ebb132d03be4b289f06d75924141

data/lib/mongo/socket.rb

@@ -49,6 +49,9 @@ module Mongo
     # @return [ Hash ] The options.
     attr_reader :options
 
+    # @return [ Float ] timeout The socket timeout.
+    attr_reader :timeout
+
     # Is the socket connection alive?
     #
     # @example Is the socket alive?
@@ -123,10 +126,14 @@ module Mongo
     def read(length)
       handle_errors do
         data = read_from_socket(length)
-        raise IOError unless (data.length > 0 || length == 0)
+        unless (data.length > 0 || length == 0)
+          raise IOError, "Expected to read > 0 bytes but read 0 bytes"
+        end
         while data.length < length
           chunk = read_from_socket(length - data.length)
-          raise IOError unless (chunk.length > 0 || length == 0)
+          unless (chunk.length > 0 || length == 0)
+            raise IOError, "Expected to read > 0 bytes but read 0 bytes"
+          end
           data << chunk
         end
         data
@@ -185,7 +192,9 @@ module Mongo
         return ''.force_encoding('BINARY')
       end
 
-      deadline = (Time.now + timeout) if timeout
+      if _timeout = self.timeout
+        deadline = Time.now + _timeout
+      end
 
       # We want to have a fixed and reasonably small size buffer for reads
       # because, for example, OpenSSL reads in 16 kb chunks max.
@@ -232,10 +241,22 @@ module Mongo
           data[retrieved, chunk.length] = chunk
           retrieved += chunk.length
         end
-      rescue IO::WaitReadable
-        select_timeout = (deadline - Time.now) if deadline
-        if (select_timeout && select_timeout <= 0) || !Kernel::select([@socket], nil, [@socket], select_timeout)
-          raise Timeout::Error.new("Took more than #{timeout} seconds to receive data.")
+      # As explained in https://ruby-doc.com/core-trunk/IO.html#method-c-select,
+      # reading from a TLS socket may require writing which may raise WaitWritable
+      rescue IO::WaitReadable, IO::WaitWritable => exc
+        if deadline
+          select_timeout = deadline - Time.now
+          if select_timeout <= 0
+            raise Errno::ETIMEDOUT, "Took more than #{_timeout} seconds to receive data"
+          end
+        end
+        if exc.is_a?(IO::WaitReadable)
+          select_args = [[@socket], nil, [@socket], select_timeout]
+        else
+          select_args = [nil, [@socket], [@socket], select_timeout]
+        end
+        unless Kernel::select(*select_args)
+          raise Errno::ETIMEDOUT, "Took more than #{_timeout} seconds to receive data"
         end
         retry
       end

data/lib/mongo/socket/ssl.rb

@@ -33,9 +33,6 @@ module Mongo
       # @return [ Integer ] port The port to connect to.
       attr_reader :port
 
-      # @return [ Float ] timeout The socket timeout.
-      attr_reader :timeout
-
       # Establishes a socket connection.
       #
       # @example Connect the socket.

data/lib/mongo/socket/tcp.rb

@@ -26,9 +26,6 @@ module Mongo
       # @return [ Integer ] port The port to connect to.
       attr_reader :port
 
-      # @return [ Float ] timeout The socket timeout.
-      attr_reader :timeout
-
       # Establishes a socket connection.
       #
       # @example Connect the socket.

data/lib/mongo/socket/unix.rb

@@ -23,9 +23,6 @@ module Mongo
       # @return [ String ] path The path to connect to.
       attr_reader :path
 
-      # @return [ Float ] timeout The socket timeout.
-      attr_reader :timeout
-
       # Initializes a new Unix socket.
       #
       # @example Create the Unix socket.

data/lib/mongo/version.rb

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

data/spec/mongo/server/connection_spec.rb

@@ -757,26 +757,30 @@ describe Mongo::Server::Connection, retry: 3 do
       end
     end
 
-    context 'when a socket timeout is set' do
+    context 'when a socket timeout is set on client' do
 
       let(:connection) do
         described_class.new(server, socket_timeout: 10)
       end
 
-      it 'sets the timeout' do
+      it 'is propagated to connection timeout' do
         expect(connection.timeout).to eq(10)
       end
+    end
 
+    context 'when an operation never completes' do
       let(:client) do
-        authorized_client.with(socket_timeout: 1.5)
+        authorized_client.with(socket_timeout: 1.5,
+          # Read retries would cause the reads to be attempted twice,
+          # thus making the find take twice as long to time out.
+          retry_reads: false, max_read_retries: 0)
       end
 
       before do
-        authorized_collection.delete_many
-        authorized_collection.insert_one(a: 1)
+        client.cluster.next_primary
       end
 
-      it 'raises a timeout when it expires' do
+      it 'times out and raises SocketTimeoutError' do
         start = Time.now
         begin
           Timeout::timeout(1.5 + 2) do
@@ -784,11 +788,11 @@ describe Mongo::Server::Connection, retry: 3 do
           end
         rescue => ex
           end_time = Time.now
-          expect(ex).to be_a(Timeout::Error)
-          expect(ex.message).to eq("Took more than 1.5 seconds to receive data.")
+          expect(ex).to be_a(Mongo::Error::SocketTimeoutError)
+          expect(ex.message).to match(/Took more than 1.5 seconds to receive data/)
         end
-        # Account for wait queue timeout (2s) and rescue
-        expect(end_time - start).to be_within(2.5).of(1.5)
+        # allow 1.5 seconds +- 0.5 seconds
+        expect(end_time - start).to be_within(1).of(2)
       end
 
       context 'when the socket_timeout is negative' do
@@ -816,7 +820,7 @@ describe Mongo::Server::Connection, retry: 3 do
         it 'raises a timeout error' do
           expect {
             reply
-          }.to raise_exception(Timeout::Error)
+          }.to raise_exception(Mongo::Error::SocketTimeoutError)
         end
       end
     end

data/spec/mongo/socket_spec.rb

@@ -1,4 +1,4 @@
-require 'lite_spec_helper'
+require 'spec_helper'
 
 describe Mongo::Socket do
 
@@ -51,4 +51,65 @@ describe Mongo::Socket do
       end.to raise_error(Mongo::Error::SocketError, 'OpenSSL::SSL::SSLError: Test error (for fake-address) (MongoDB may not be configured with SSL support)')
     end
   end
+
+  describe '#read' do
+    let(:target_host) do
+      host = ClusterConfig.instance.primary_address_host
+      # Take ipv4 address
+      Socket.getaddrinfo(host, 0).detect { |ai| ai.first == 'AF_INET' }[3]
+    end
+
+    let(:socket) do
+      Mongo::Socket::TCP.new(target_host, ClusterConfig.instance.primary_address_port, 1, Socket::PF_INET)
+    end
+
+    let(:raw_socket) { socket.instance_variable_get('@socket') }
+
+    let(:wait_readable_class) do
+      Class.new(Exception) do
+        include IO::WaitReadable
+      end
+    end
+
+    context 'timeout' do
+
+      shared_examples_for 'times out' do
+        it 'times out' do
+          expect(socket).to receive(:timeout).at_least(:once).and_return(0.2)
+          # When we raise WaitWritable, the socket object is ready for
+          # writing which makes the read method invoke read_nonblock many times
+          expect(raw_socket).to receive(:read_nonblock).at_least(:once) do |len, buf|
+            sleep 0.01
+            raise exception_class
+          end
+
+          expect do
+            socket.read(10)
+          end.to raise_error(Mongo::Error::SocketTimeoutError, /Took more than .* seconds to receive data \(for /)
+        end
+      end
+
+      context 'with WaitReadable' do
+
+        let(:exception_class) do
+          Class.new(Exception) do
+            include IO::WaitReadable
+          end
+        end
+
+        it_behaves_like 'times out'
+      end
+
+      context 'with WaitWritable' do
+
+        let(:exception_class) do
+          Class.new(Exception) do
+            include IO::WaitWritable
+          end
+        end
+
+        it_behaves_like 'times out'
+      end
+    end
+  end
 end

data/spec/support/cluster_config.rb

@@ -74,6 +74,20 @@ class ClusterConfig
     end
   end
 
+  def primary_address_str
+    primary_address
+  end
+
+  def primary_address_host
+    both = primary_address_str
+    both.split(':').first
+  end
+
+  def primary_address_port
+    both = primary_address_str
+    both.split(':')[1] || 27017
+  end
+
   # Try running a command on the admin database to see if the mongod was
   # started with auth.
   def auth_enabled?

data/spec/support/spec_config.rb

@@ -328,7 +328,6 @@ EOT
     {
       max_pool_size: 1,
       heartbeat_frequency: 20,
-      max_read_retries: 5,
       # The test suite seems to perform a number of operations
       # requiring server selection. Hence a timeout of 1 here,
       # together with e.g. a misconfigured replica set,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo
 version: !ruby/object:Gem::Version
-  version: 2.9.1.rc0
+  version: 2.9.1
 platform: ruby
 authors:
 - Tyler Brock
@@ -31,7 +31,7 @@ cert_chain:
   bMYVwXXhV8czdzgkQB/ZPWHSbEWXnmkze1mzvqWBCPOVXYrcnL9cnEl/RoxtS1hr
   Db6Ac6mCUSYfYHBWpWqxjc45n70i5Xi1
   -----END CERTIFICATE-----
-date: 2019-08-06 00:00:00.000000000 Z
+date: 2019-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
@@ -1088,9 +1088,9 @@ 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: []
 rubygems_version: 3.0.3
 signing_key: