RUBY-375

lib/mongo/util/pool.rb

@@ -236,12 +236,10 @@ module Mongo
     #
     # Note: this must be called from within a mutex.
     def prune
-      surplus = @size - @sockets.size
-      return if surplus <= 0
       idle_sockets = @sockets - @checked_out
-      [surplus, idle_sockets.length].min.times do |n|
+      idle_sockets.each do |socket|
-        idle_sockets[n].close
+        socket.close unless socket.closed?
-        @sockets.delete(idle_sockets[n])
+        @sockets.delete(socket)
       end
     end
 
@@ -259,7 +257,9 @@ module Mongo
         end
 
         @connection_mutex.synchronize do
-          #prune
+          if @sockets.size > @size * 1.5
+            prune
+          end
 
           socket = if @checked_out.size < @sockets.size
                      checkout_existing_socket

test/replica_sets/pooled_insert_test.rb

@@ -0,0 +1,58 @@
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require './test/replica_sets/rs_test_helper'
+
+# NOTE: This test expects a replica set of three nodes to be running
+# on the local host.
+class ReplicaSetPooledInsertTest < Test::Unit::TestCase
+  include ReplicaSetTest
+
+  def setup
+    @conn = ReplSetConnection.new([self.rs.host, self.rs.ports[0]], [self.rs.host, self.rs.ports[1]],
+      [self.rs.host, self.rs.ports[2]], :pool_size => 5, :timeout => 5, :refresh_mode => false)
+    @db = @conn.db(MONGO_TEST_DB)
+    @db.drop_collection("test-sets")
+    @coll = @db.collection("test-sets")
+  end
+
+  def teardown
+    self.rs.restart_killed_nodes
+    @conn.close if @conn
+  end
+
+  def test_insert
+    expected_results = [-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+    @coll.save({:a => -1}, :safe => true)
+
+    self.rs.kill_primary
+
+    threads = []
+    10.times do |i|
+      threads[i] = Thread.new do
+        rescue_connection_failure do
+          @coll.save({:a => i}, :safe => true)
+        end
+      end
+    end
+
+    threads.each {|t| t.join}
+
+    # Restart the old master and wait for sync
+    self.rs.restart_killed_nodes
+    sleep(1)
+    results = []
+
+    rescue_connection_failure do
+      @coll.find.each {|r| results << r}
+      expected_results.each do |a|
+        assert results.any? {|r| r['a'] == a}, "Could not find record for a => #{a}"
+      end
+    end
+
+    @coll.save({:a => 10}, :safe => true)
+    @coll.find.each {|r| results << r}
+    (expected_results + [10]).each do |a|
+      assert results.any? {|r| r['a'] == a}, "Could not find record for a => #{a} on second find"
+    end
+  end
+
+end