mongo 1.2.1 → 1.2.2

data/docs/HISTORY.md

@@ -1,5 +1,11 @@
 # MongoDB Ruby Driver History
 
+### 1.2.2
+2011-2-15
+
+* Improved replica set failover for edge case.
+* Fix for REE on OSX (Hongli Lai)
+
 ### 1.2.1
 2011-1-18
 

data/docs/REPLICA_SETS.md

@@ -63,7 +63,7 @@ The Ruby driver (>= 1.1.5) includes unit tests for verifying replica set behavio
     rake test:rs
 
 The suite will set up a five-node replica set by itself and ensure that driver behaves correctly even in the face
-of individual node failures. Node that the `mongod` executable must be in the search path for this to work.
+of individual node failures. Note that the `mongod` executable must be in the search path for this to work.
 
 ### Further Reading
 

data/lib/mongo.rb

@@ -19,7 +19,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 module Mongo
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end
 
 module Mongo

data/lib/mongo/connection.rb

@@ -795,7 +795,7 @@ module Mongo
       begin
         message = new_binary_string
         socket.read(length, message)
-        raise ConnectionFailure, "connection closed" unless message.length > 0
+        raise ConnectionFailure, "connection closed" unless message && message.length > 0
         if message.length < length
           chunk = new_binary_string
           while message.length < length

data/lib/mongo/repl_set_connection.rb

@@ -119,8 +119,10 @@ module Mongo
         BSON::BSON_CODER.update_max_bson_size(self)
       else
         if @secondary_pools.empty?
+          close # close any existing pools and sockets
           raise ConnectionFailure, "Failed to connect any given host:port"
         else
+          close # close any existing pools and sockets
           raise ConnectionFailure, "Failed to connect to primary node."
         end
       end
@@ -136,7 +138,7 @@ module Mongo
     #
     # @return [Boolean]
     def read_primary?
-      !@read_pool || @read_pool.length.zero?
+      !@read_pool
     end
     alias :primary? :read_primary?
 
@@ -194,9 +196,13 @@ module Mongo
 
         check_set_name(config, socket)
       rescue OperationFailure, SocketError, SystemCallError, IOError => ex
-        close unless connected?
+        # It's necessary to rescue here. The #connect method will keep trying
+        # until it has no more nodes to try and raise a ConnectionFailure if
+        # it can't connect to a primary.
       ensure
+        socket.close if socket
         @nodes_tried << node
+
         if config
           nodes = []
           nodes += config['hosts'] if config['hosts']
@@ -208,8 +214,6 @@ module Mongo
             @logger.warn("MONGODB #{config['msg']}")
           end
         end
-
-        socket.close if socket
       end
 
       config

data/lib/mongo/util/pool.rb

@@ -76,7 +76,7 @@ module Mongo
       socket = TCPSocket.new(@host, @port)
       socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
       rescue => ex
-        raise ConnectionFailure, "Failed to connect socket: #{ex}"
+        raise ConnectionFailure, "Failed to connect to host #{@host} and port #{@port}: #{ex}"
       end
 
       # If any saved authentications exist, we want to apply those
@@ -146,7 +146,7 @@ module Mongo
 
           if socket
 
-          # This call all procs, in order, scoped to existing sockets.
+          # This calls all procs, in order, scoped to existing sockets.
           # At the moment, we use this to lazily authenticate and
           # logout existing socket connections.
           @socket_ops[socket].reject! do |op|

data/test/replica_sets/query_secondaries.rb

@@ -17,8 +17,10 @@ class ReplicaSetQuerySecondariesTest < Test::Unit::TestCase
   end
 
   def test_read_primary
-    assert !@conn.read_primary?
-    assert !@conn.primary?
+    rescue_connection_failure do
+      assert !@conn.read_primary?
+      assert !@conn.primary?
+    end
   end
 
   def test_con
@@ -59,6 +61,12 @@ class ReplicaSetQuerySecondariesTest < Test::Unit::TestCase
     # Should still be able to read immediately after killing master node
     RS.kill_primary
     assert_equal 2, @coll.find.to_a.length
+    rescue_connection_failure do
+      @coll.save({:a => 50}, :safe => {:w => 2, :wtimeout => 10000})
+    end
+    RS.restart_killed_nodes
+    @coll.save({:a => 50}, :safe => {:w => 2, :wtimeout => 10000})
+    assert_equal 4, @coll.find.to_a.length
   end
 
   def test_kill_secondary
@@ -71,6 +79,7 @@ class ReplicaSetQuerySecondariesTest < Test::Unit::TestCase
     RS.kill(read_node)
 
     # Should fail immediately on next read
+    old_read_pool_port = @conn.read_pool.port
     assert_raise ConnectionFailure do
       @coll.find.to_a.length
     end
@@ -80,6 +89,8 @@ class ReplicaSetQuerySecondariesTest < Test::Unit::TestCase
       length = @coll.find.to_a.length
       assert_equal 2, length
     end
+    new_read_pool_port = @conn.read_pool.port
+    assert old_read_pool != new_read_pool
   end
 
 end

data/test/replica_sets/rs_test_helper.rb

@@ -16,7 +16,7 @@ class Test::Unit::TestCase
     begin
       yield
     rescue Mongo::ConnectionFailure => ex
-      puts "Rescue attempt #{retries}"
+      puts "Rescue attempt #{retries}: from #{ex}"
       retries += 1
       raise ex if retries > max_retries
       sleep(1)

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongo
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 27
+  prerelease: 
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - Jim Menard
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-10 00:00:00 -05:00
+date: 2011-02-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,11 +28,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 2
-        - 1
-        version: 1.2.1
+        - 2
+        version: 1.2.2
   type: :runtime
   version_requirements: *id001
 description: A Ruby driver for MongoDB. For more information about Mongo, see http://www.mongodb.org.
@@ -153,6 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -161,13 +164,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: Ruby driver for the MongoDB