mongo 2.21.1 → 2.21.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 047b2bd74446fc71cfe815c1610d47608078301092f8bbd29c0819f85fb1ed3c
-  data.tar.gz: 931d7cf1753c4bcdfc66a8d25867b591daa3027d653488dfe28023a55dc4f378
+  metadata.gz: 581c10bfc119dd624b9c29d9471e7697ed7ece568cc7023c2a4894b9e430e58e
+  data.tar.gz: 634e8d69003d43838f47999e13d5677492cfd7ea396cec02907c17c734709024
 SHA512:
-  metadata.gz: 843f969dc849f53be7531c3cc7cf0f2f0100b383eadf442709fbfa10aad89b56940c60351b06f68f9a08bf76896889bbb752d6d1dbfdef854dd2eccb673c93cf
-  data.tar.gz: 7568cad4a519464cffd3953f9183c4cf85d1fe9c4818e18bbefc9c5b82ec91f76ea228a51bd760a3be5f98e92275628452e65b96fe3d5f4b1f3f0435ab9ecdea
+  metadata.gz: a58d9b653904b7c399be80f414551b00228b97078811e31c3d623ea924596510a39702c22e4830d166984326b8494d723f7e35cf6dfabbc8f06a0d30ff780c99
+  data.tar.gz: 11d1adcea0991ec8adca191c4015dc6914622e6bf5753046a8b0ad24cdf5de138329a702b522ba54d474dd03b18a983722827b112825b5602101e550cdd3754c

data/README.md

@@ -121,11 +121,13 @@ their applications.
 Please refer to [spec/README.md](https://github.com/mongodb/mongo-ruby-driver/blob/master/spec/README.md) for instructions on how
 to run the driver's test suite.
 
-## Release History
+## Releases 
 
 Full release notes and release history are available [on the GitHub releases
 page](https://github.com/mongodb/mongo-ruby-driver/releases).
 
+The MongoDB Ruby driver follows [semantic versioning](https://semver.org/) for its releases.
+
 ## License
 
 Copyright (C) 2009-2020 MongoDB, Inc.

data/lib/mongo/server/connection_pool/generation_manager.rb

@@ -47,13 +47,15 @@ module Mongo
         end
 
         def pipe_fds(service_id: nil)
-          @pipe_fds[service_id][@map[service_id]]
+          @pipe_fds.dig(service_id, @map[service_id])
         end
 
         def remove_pipe_fds(generation, service_id: nil)
           validate_service_id!(service_id)
 
           r, w = @pipe_fds[service_id].delete(generation)
+          return unless r && w
+
           w.close
           # Schedule the read end of the pipe to be closed. We cannot close it
           # immediately since we need to wait for any Kernel#select calls to
@@ -89,8 +91,31 @@ module Mongo
           end
         end
 
+        # Close all pipes in the generation manager.
+        #
+        # This method should be called only when the +ConnectionPool+ that
+        # owns this +GenerationManager+ is closed, to ensure that all
+        # pipes are closed properly.
+        def close_all_pipes
+          @lock.synchronize do
+            close_all_scheduled
+            @pipe_fds.keys.each do |service_id|
+              generations = @pipe_fds.delete(service_id)
+              generations.values.each do |(r, w)|
+                r.close
+                w.close
+              rescue IOError
+                # Ignore any IOError that occurs when closing the
+                # pipe, as there is nothing we can do about it.
+              end
+            end
+          end
+        end
+
+
         private
 
+
         def validate_service_id!(service_id)
           if service_id
             unless server.load_balancer?

data/lib/mongo/server/connection_pool.rb

@@ -671,6 +671,7 @@ module Mongo
 
           @max_connecting_cv.broadcast
           @size_cv.broadcast
+          @generation_manager.close_all_pipes
         end
 
         publish_cmap_event(

data/lib/mongo/socket.rb

@@ -64,6 +64,9 @@ module Mongo
     #   connection (for non-monitoring connections) that created this socket.
     # @option options [ true | false ] :monitor Whether this socket was
     #   created by a monitoring connection.
+    # @option options :pipe [ IO ] The file descriptor for the read end of the
+    #   pipe to listen on during the select system call when reading from the
+    #   socket.
     #
     # @api private
     def initialize(timeout, options)
@@ -106,6 +109,13 @@ module Mongo
       !!options[:monitor]
     end
 
+    # @return [ IO ] The file descriptor for the read end of the pipe to
+    # listen on during the select system call when reading from the
+    # socket.
+    def pipe
+      options[:pipe]
+    end
+
     # @return [ String ] Human-readable summary of the socket for debugging.
     #
     # @api private
@@ -161,7 +171,7 @@ module Mongo
       begin
         # Sometimes it seems the close call can hang for a long time
         ::Timeout.timeout(5) do
-          @socket.close
+          @socket&.close
         end
       rescue
         # Silence all errors
@@ -390,7 +400,6 @@ module Mongo
             raise_timeout_error!("Took more than #{_timeout} seconds to receive data", csot)
           end
         end
-        pipe = options[:pipe]
         if exc.is_a?(IO::WaitReadable)
           if pipe
             select_args = [[@socket, pipe], nil, [@socket, pipe], select_timeout]

data/lib/mongo/version.rb

@@ -1,20 +1,9 @@
 # frozen_string_literal: true
 
-# Copyright (C) 2014-2020 MongoDB Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 module Mongo
   # The current version of the driver.
-  VERSION = '2.21.1'
+  #
+  # Note that this file is automatically updated via `rake candidate:create`.
+  # Manual changes to this file will be overwritten by that rake task.
+  VERSION = '2.21.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo
 version: !ruby/object:Gem::Version
-  version: 2.21.1
+  version: 2.21.2
 platform: ruby
 authors:
 - The MongoDB Ruby Team
@@ -553,7 +553,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.8
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Ruby driver for MongoDB
 test_files: []