mongo 1.5.1 → 1.5.2

data/Rakefile

@@ -1,11 +1,16 @@
 # -*- mode: ruby; -*-
-require 'rubygems'
-require 'rubygems/specification'
+if RUBY_VERSION < '1.9.0'
+  require 'rubygems'
+  require 'rubygems/specification'
+end
 require 'fileutils'
-require 'rake'
 require 'rake/testtask'
-require 'rake/gempackagetask'
 require 'rbconfig'
+require 'rake'
+begin
+  require 'ci/reporter/rake/test_unit'
+  rescue LoadError
+end
 include Config
 ENV['TEST_MODE'] = 'TRUE'
 
@@ -154,11 +159,11 @@ namespace :bamboo do
   end
 
   namespace :test do
-    task :ruby => [:ci_reporter, "ci:setup:testunit"] do
+    task :ruby do
       Rake::Task['test:ruby'].invoke
     end
 
-    task :c => [:ci_reporter, "ci:setup:testunit"] do
+    task :c do
       Rake::Task['gem:install_extensions'].invoke
       Rake::Task['test:c'].invoke
     end

data/docs/HISTORY.md

@@ -1,5 +1,12 @@
 # MongoDB Ruby Driver History
 
+### 1.5.2
+2011-12-13
+
+* Lots of fixes for replica set connection edge cases.
+* Set default op_timeout and connect_timeout to 30 seconds.
+* Support GeoHaystack indexing.
+
 ### 1.5.1
 2011-11-29
 

data/lib/mongo.rb

@@ -16,14 +16,13 @@
 # limitations under the License.
 # ++
 
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
 require 'mongo/version'
 
 module Mongo
-  ASCENDING  =  1
-  DESCENDING = -1
-  GEO2D      = '2d'
+  ASCENDING   =  1
+  DESCENDING  = -1
+  GEO2D       = '2d'
+  GEOHAYSTACK = 'geoHaystack'
 
   DEFAULT_MAX_BSON_SIZE = 4 * 1024 * 1024
 

data/lib/mongo/collection.rb

@@ -888,7 +888,7 @@ module Mongo
         field_spec[spec.to_s] = 1
       elsif spec.is_a?(Array) && spec.all? {|field| field.is_a?(Array) }
         spec.each do |f|
-          if [Mongo::ASCENDING, Mongo::DESCENDING, Mongo::GEO2D].include?(f[1])
+          if [Mongo::ASCENDING, Mongo::DESCENDING, Mongo::GEO2D, Mongo::GEOHAYSTACK].include?(f[1])
             field_spec[f[0].to_s] = f[1]
           else
             raise MongoArgumentError, "Invalid index field #{f[1].inspect}; " + 

data/lib/mongo/connection.rb

@@ -458,12 +458,13 @@ module Mongo
       @primary_pool
     end
 
-    # The value of the read preference. Because
-    # this is a single-node connection, the value
-    # is +:primary+, and the connection will read
-    # from whichever type of node it's connected to.
+    # The value of the read preference.
     def read_preference
-      :primary
+      if slave_ok?
+        :secondary
+      else
+        :primary
+      end
     end
 
     # Close the connection to the database.
@@ -614,7 +615,13 @@ module Mongo
           socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
         end
 
-        config = self['admin'].command({:ismaster => 1}, :socket => socket)
+        if @connect_timeout
+          Mongo::TimeoutHandler.timeout(@connect_timeout, OperationTimeout) do
+            config = self['admin'].command({:ismaster => 1}, :socket => socket)
+          end
+        else
+          config = self['admin'].command({:ismaster => 1}, :socket => socket)
+        end
       rescue OperationFailure, SocketError, SystemCallError, IOError => ex
         close
       ensure

data/lib/mongo/cursor.rb

@@ -86,7 +86,7 @@ module Mongo
       if(!@timeout)
         add_option(OP_QUERY_NO_CURSOR_TIMEOUT)
       end
-      if(@connection.slave_ok?)
+      if(@read_preference != :primary)
         add_option(OP_QUERY_SLAVE_OK)
       end
       if(@tailable)
@@ -136,7 +136,7 @@ module Mongo
         # If the server has stopped being the master (e.g., it's one of a
         # pair but it has died or something like that) then we close that
         # connection. The next request will re-open on master server.
-        if err == "not master"
+        if err.include?("not master")
           @connection.close
           raise ConnectionFailure.new(err, doc['code'], doc)
         end
@@ -463,9 +463,8 @@ module Mongo
 
     def send_initial_query
       message = construct_query_message
-      payload = instrument_payload if @logger
       sock    = @socket || checkout_socket_from_connection
-      instrument(:find, payload) do
+      instrument(:find, instrument_payload) do
         begin
         results, @n_received, @cursor_id = @connection.receive_message(
           Mongo::Constants::OP_QUERY, message, nil, sock, @command,
@@ -518,13 +517,21 @@ module Mongo
     end
 
     def checkout_socket_from_connection
-      @checkin_connection = true
-      if @command || @read_preference == :primary
-        @connection.checkout_writer
-      else
-        @read_pool = @connection.read_pool
-        @connection.checkout_reader
+      socket = nil
+      begin
+        @checkin_connection = true
+        if @command || @read_preference == :primary
+          socket = @connection.checkout_writer
+        else
+          @read_pool = @connection.read_pool
+          socket = @connection.checkout_reader
+        end
+      rescue SystemStackError, NoMemoryError, SystemCallError => ex
+        @connection.close
+        raise ex
       end
+
+      socket
     end
 
     def checkout_socket_for_op_get_more
@@ -540,9 +547,15 @@ module Mongo
         pool.host == @read_pool.host && pool.port == @read_pool.port
       end
       if new_pool
-        @read_pool = new_pool
-        sock = new_pool.checkout
-        @checkin_read_pool = true
+        sock = nil
+        begin
+          @read_pool = new_pool
+          sock = new_pool.checkout
+          @checkin_read_pool = true
+        rescue SystemStackError, NoMemoryError, SystemCallError => ex
+          @connection.close
+          raise ex
+        end
         return sock
       else
         raise Mongo::OperationFailure, "Failure to continue iterating " +

data/lib/mongo/networking.rb

@@ -28,19 +28,25 @@ module Mongo
       add_message_headers(message, operation)
       packed_message = message.to_s
 
-      if connection == :writer
-        sock = checkout_writer
-      else
-        sock = checkout_reader
-      end
-
+      sock = nil
       begin
-        send_message_on_socket(packed_message, sock)
-      ensure
         if connection == :writer
-          checkin_writer(sock)
+          sock = checkout_writer
         else
-          checkin_reader(sock)
+          sock = checkout_reader
+        end
+
+        send_message_on_socket(packed_message, sock)
+      rescue SystemStackError, NoMemoryError, SystemCallError => ex
+        close
+        raise ex
+      ensure
+        if sock
+          if connection == :writer
+            checkin_writer(sock)
+          else
+            checkin_reader(sock)
+          end
         end
       end
     end
@@ -66,14 +72,18 @@ module Mongo
       last_error_id = add_message_headers(last_error_message, Mongo::Constants::OP_QUERY)
 
       packed_message = message.append!(last_error_message).to_s
-      sock = checkout_writer
+      sock = nil
       begin
+        sock = checkout_writer
         send_message_on_socket(packed_message, sock)
         docs, num_received, cursor_id = receive(sock, last_error_id)
         checkin_writer(sock)
       rescue ConnectionFailure, OperationFailure, OperationTimeout => ex
         checkin_writer(sock)
         raise ex
+      rescue SystemStackError, NoMemoryError, SystemCallError => ex
+        close
+        raise ex
       end
 
       if num_received == 1 && (error = docs[0]['err'] || docs[0]['errmsg'])
@@ -103,24 +113,29 @@ module Mongo
                         read=:primary, exhaust=false)
       request_id = add_message_headers(message, operation)
       packed_message = message.to_s
-      if socket
-        sock = socket
-        should_checkin = false
-      else
-        if command || read == :primary
-          sock = checkout_writer
-        elsif read == :secondary
-          sock = checkout_reader
-        else
-          sock = checkout_tagged(read)
-        end
-        should_checkin = true
-      end
 
       result = ''
+      sock   = nil
       begin
+        if socket
+          sock = socket
+          should_checkin = false
+        else
+          if command || read == :primary
+            sock = checkout_writer
+          elsif read == :secondary
+            sock = checkout_reader
+          else
+            sock = checkout_tagged(read)
+          end
+          should_checkin = true
+        end
+
         send_message_on_socket(packed_message, sock)
         result = receive(sock, request_id, exhaust)
+      rescue SystemStackError, NoMemoryError, SystemCallError => ex
+        close
+        raise ex
       ensure
         if should_checkin
           if command || read == :primary

data/lib/mongo/repl_set_connection.rb

@@ -51,9 +51,8 @@ module Mongo
     # @option options [Float] :pool_timeout (5.0) When all of the connections a pool are checked out,
     #   this is the number of seconds to wait for a new connection to be released before throwing an exception.
     #   Note: this setting is relevant only for multi-threaded applications.
-    # @option opts [Float] :op_timeout (nil) The number of seconds to wait for a read operation to time out.
-    #   Disabled by default.
-    # @option opts [Float] :connect_timeout (nil) The number of seconds to wait before timing out a
+    # @option opts [Float] :op_timeout (30) The number of seconds to wait for a read operation to time out.
+    # @option opts [Float] :connect_timeout (30) The number of seconds to wait before timing out a
     #   connection attempt.
     # @option opts [Boolean] :ssl (false) If true, create the connection to the server using SSL.
     # @option opts [Boolean] :refresh_mode (false) Set this to :sync to periodically update the
@@ -91,8 +90,10 @@ module Mongo
         raise MongoArgumentError, "A ReplSetConnection requires at least one seed node."
       end
 
-      # The list of seed nodes
+      # The original, immutable list of seed node.
+      # TODO: add a method for replacing this list of node.
       @seeds = args
+      @seeds.freeze
 
       # TODO: get rid of this
       @nodes = @seeds.dup
@@ -152,10 +153,12 @@ module Mongo
     def connect
       log(:info, "Connecting...")
       return if @connected
-      manager = PoolManager.new(self, @seeds)
-      manager.connect
 
-      update_config(manager)
+      discovered_seeds = @manager ? @manager.seeds : []
+      @manager = PoolManager.new(self, discovered_seeds)
+
+      @manager.connect
+      @refresh_version += 1
 
       if @require_primary && self.primary.nil? #TODO: in v2.0, we'll let this be optional and do a lazy connect.
         close
@@ -200,19 +203,21 @@ module Mongo
     #   to get the refresh lock.
     def hard_refresh!
       log(:info, "Initiating hard refresh...")
-      background_manager = PoolManager.new(self, @seeds)
+      discovered_seeds = @manager ? @manager.seeds : []
+      background_manager = PoolManager.new(self, discovered_seeds | @seeds)
       background_manager.connect
 
       # TODO: make sure that connect has succeeded
       old_manager = @manager
-      update_config(background_manager)
+      @manager = background_manager
       old_manager.close(:soft => true)
+      @refresh_version += 1
 
       return true
     end
 
     def connected?
-      self.primary_pool || self.read_pool
+      @connected && (self.primary_pool || self.read_pool)
     end
 
     # @deprecated
@@ -255,9 +260,13 @@ module Mongo
     end
 
     # Close the connection to the database.
-    def close
+    def close(opts={})
+      if opts[:soft]
+        @manager.close(:soft => true) if @manager
+      else
+        @manager.close if @manager
+      end
       @connected = false
-      @manager.close(:soft => true) if @manager
     end
 
     # If a ConnectionFailure is raised, this method will be called
@@ -298,12 +307,22 @@ module Mongo
     # Note that @read_pool might point to the primary pool
     # if no read pool has been defined.
     def checkout_reader
-      connect unless connected?
-      socket = get_socket_from_pool(self.read_pool)
-
-      if !socket
+      if connected?
+        sync_refresh
+      else
         connect
-        socket = get_socket_from_pool(self.primary_pool)
+      end
+
+      begin
+        socket = get_socket_from_pool(self.read_pool)
+
+        if !socket
+          connect
+          socket = get_socket_from_pool(self.primary_pool)
+        end
+      rescue => ex
+        checkin(socket) if socket
+        raise ex
       end
 
       if socket
@@ -315,12 +334,21 @@ module Mongo
 
     # Checkout a socket for writing (i.e., a primary node).
     def checkout_writer
-      connect unless connected?
-      socket = get_socket_from_pool(self.primary_pool)
-
-      if !socket
+      if connected?
+        sync_refresh
+      else
         connect
+      end
+      begin
         socket = get_socket_from_pool(self.primary_pool)
+
+        if !socket
+          connect
+          socket = get_socket_from_pool(self.primary_pool)
+        end
+      rescue => ex
+        checkin(socket)
+        raise ex
       end
 
       if socket
@@ -332,8 +360,8 @@ module Mongo
 
     # Checkin a socket used for reading.
     def checkin_reader(socket)
-      if !self.read_pool.checkin(socket) &&
-        !self.primary_pool.checkin(socket)
+      if !((self.read_pool && self.read_pool.checkin(socket)) ||
+        (self.primary_pool && self.primary_pool.checkin(socket)))
         close_socket(socket)
       end
       sync_refresh
@@ -341,7 +369,7 @@ module Mongo
 
     # Checkin a socket used for writing.
     def checkin_writer(socket)
-      if !self.primary_pool.checkin(socket)
+      if !self.primary_pool || !self.primary_pool.checkin(socket)
         close_socket(socket)
       end
       sync_refresh
@@ -349,7 +377,7 @@ module Mongo
 
     def close_socket(socket)
       begin
-        socket.close
+        socket.close if socket
       rescue IOError
         log(:info, "Tried to close socket #{socket} but already closed.")
       end
@@ -372,36 +400,40 @@ module Mongo
     end
 
     def primary
-      @manager.primary
+      @manager ? @manager.primary : nil
     end
 
     # Note: might want to freeze these after connecting.
     def secondaries
-      @manager.secondaries
+      @manager ? @manager.secondaries : []
     end
 
     def hosts
-      @manager.hosts
+      @manager ? @manager.hosts : []
     end
 
     def primary_pool
-      @manager.primary_pool
+      @manager ? @manager.primary_pool : nil
     end
 
     def read_pool
-      @manager.read_pool
+      @manager ? @manager.read_pool : nil
     end
 
     def secondary_pools
-      @manager.secondary_pools
+      @manager ? @manager.secondary_pools : []
     end
 
     def tag_map
-      @manager.tag_map
+      @manager ? @manager.tag_map : {}
     end
 
     def max_bson_size
-      @manager.max_bson_size
+      if @manager && @manager.max_bson_size
+        @manager.max_bson_size
+      else
+        Mongo::DEFAULT_MAX_BSON_SIZE
+      end
     end
 
     private
@@ -437,10 +469,10 @@ module Mongo
       @pool_timeout = opts[:pool_timeout] || opts[:timeout] || 5.0
 
       # Timeout on socket read operation.
-      @op_timeout = opts[:op_timeout] || nil
+      @op_timeout = opts[:op_timeout] || 30
 
       # Timeout on socket connect.
-      @connect_timeout = opts[:connect_timeout] || nil
+      @connect_timeout = opts[:connect_timeout] || 30
 
       # Mutex for synchronizing pool access
       # TODO: remove this.
@@ -468,14 +500,6 @@ module Mongo
       connect if should_connect
     end
 
-    # Given a pool manager, update this connection's
-    # view of the replica set.
-    def update_config(new_manager)
-      @manager = new_manager
-      @seeds   = @manager.seeds.dup
-      @refresh_version += 1
-    end
-
     # Checkout a socket connected to a node with one of
     # the provided tags. If no such node exists, raise
     # an exception.