mongo 1.8.2 → 1.8.3.rc0

data/lib/mongo/gridfs/grid_ext.rb

@@ -1,21 +1,3 @@
-# encoding: UTF-8
-
-# --
-# Copyright (C) 2008-2012 10gen 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
   module GridExt
     module InstanceMethods

data/lib/mongo/gridfs/grid_file_system.rb

@@ -1,21 +1,3 @@
-# encoding: UTF-8
-
-# --
-# Copyright (C) 2008-2012 10gen 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
 
   # A file store built on the GridFS specification featuring
@@ -39,12 +21,12 @@ module Mongo
 
       @default_query_opts = {:sort => [['filename', 1], ['uploadDate', -1]], :limit => 1}
 
-      # Create indexes only if we're connected to a primary node.
+      # This will create indexes only if we're connected to a primary node.
       connection = @db.connection
-      if (connection.class == MongoClient && connection.read_primary?) ||
-          (connection.class == MongoReplicaSetClient && connection.primary)
-        @files.create_index([['filename', 1], ['uploadDate', -1]])
-        @chunks.create_index([['files_id', Mongo::ASCENDING], ['n', Mongo::ASCENDING]], :unique => true)
+      begin
+        @files.ensure_index([['filename', 1], ['uploadDate', -1]])
+        @chunks.ensure_index([['files_id', Mongo::ASCENDING], ['n', Mongo::ASCENDING]], :unique => true)
+      rescue Mongo::ConnectionFailure
       end
     end
 
@@ -104,9 +86,18 @@ module Mongo
       opts = opts.dup
       opts.merge!(default_grid_io_opts(filename))
       if mode == 'w'
-        versions = opts.delete(:versions)
-        if opts.delete(:delete_old) || (versions && versions < 1)
-          versions = 1
+        begin
+          # Ensure there are the appropriate indexes, as state may have changed since instantiation of self.
+          # Recall that index definitions are cached with ensure_index so this statement won't unneccesarily repeat index creation.
+          @files.ensure_index([['filename', 1], ['uploadDate', -1]])
+          @chunks.ensure_index([['files_id', Mongo::ASCENDING], ['n', Mongo::ASCENDING]], :unique => true)
+          versions = opts.delete(:versions)
+          if opts.delete(:delete_old) || (versions && versions < 1)
+            versions = 1
+          end
+        rescue Mongo::ConnectionFailure => e
+          raise e, "Failed to create necessary indexes and write data."
+          return
         end
       end
       file = GridIO.new(@files, @chunks, filename, mode, opts)

data/lib/mongo/gridfs/grid_io.rb

@@ -1,21 +1,3 @@
-# encoding: UTF-8
-
-# --
-# Copyright (C) 2008-2012 10gen 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.
-# ++
-
 require 'digest/md5'
 
 module Mongo

data/lib/mongo/legacy.rb

@@ -1,21 +1,3 @@
-# encoding: UTF-8
-
-# --
-# Copyright (C) 2008-2012 10gen 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
   module LegacyWriteConcern
     @legacy_write_concern = true

data/lib/mongo/mongo_client.rb

@@ -1,21 +1,3 @@
-# encoding: UTF-8
-
-# --
-# Copyright (C) 2008-2012 10gen 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.
-# ++
-
 require 'set'
 require 'socket'
 require 'thread'
@@ -128,9 +110,6 @@ module Mongo
       opts = args.last.is_a?(Hash) ? args.pop : {}
       @host, @port = parse_init(args[0], args[1], opts)
 
-      # Default maximum BSON object size
-      @max_bson_size = Mongo::DEFAULT_MAX_BSON_SIZE
-
       # Lock for request ids.
       @id_lock = Mutex.new
 
@@ -181,7 +160,7 @@ module Mongo
 
     # Initialize a connection to MongoDB using the MongoDB URI spec.
     #
-    # Since MongoClient.new cannot be used with any <code>ENV["MONGODB_URI"]</code> that has multiple hosts (implying a replicaset),
+    # Since MongoClient.new cannot be used with any <code>ENV["MONGODB_URI"]</code> that has multiple hosts (implying a replicaset), 
     # you may use this when the type of your connection varies by environment and should be determined solely from <code>ENV["MONGODB_URI"]</code>.
     #
     # @param uri [String]
@@ -471,7 +450,8 @@ module Mongo
           @mongos = true
         end
 
-        @max_bson_size = config['maxBsonObjectSize'] || Mongo::DEFAULT_MAX_BSON_SIZE
+        @max_bson_size = config['maxBsonObjectSize']
+        @max_message_size = config['maxMessageSizeBytes']
         set_primary(host_port)
       end
 
@@ -479,10 +459,7 @@ module Mongo
         raise ConnectionFailure, "Failed to connect to a master node at #{host_port.join(":")}"
       end
     end
-
-    # Ensures that the alias carries over to the overridden connect method when using
-    # the replica set or sharded clients.
-    def reconnect; connect end
+    alias :reconnect :connect
 
     # It's possible that we defined connected as all nodes being connected???
     # NOTE: Do check if this needs to be more stringent.
@@ -514,10 +491,7 @@ module Mongo
     def read_primary?
       @read_primary
     end
-
-    # Ensures that the alias carries over to the overridden connect method when using
-    # the replica set or sharded clients.
-    def primary?; read_primary? end
+    alias :primary? :read_primary?
 
     # The socket pool that this connection reads from.
     #
@@ -538,7 +512,11 @@ module Mongo
     #
     # @return [Integer]
     def max_bson_size
-      @max_bson_size
+      @max_bson_size || DEFAULT_MAX_BSON_SIZE
+    end
+
+    def max_message_size
+      @max_message_size || DEFAULT_MAX_MESSAGE_SIZE
     end
 
     # Checkout a socket for reading (i.e., a secondary node).
@@ -559,7 +537,7 @@ module Mongo
     # Note: this is overridden in MongoReplicaSetClient.
     def checkin(socket)
       if @primary_pool && socket && socket.pool
-        socket.pool.checkin(socket)
+        socket.checkin
       end
     end
 

data/lib/mongo/mongo_replica_set_client.rb

@@ -1,21 +1,3 @@
-# encoding: UTF-8
-
-# --
-# Copyright (C) 2008-2012 10gen 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
 
   # Instantiates and manages connections to a MongoDB replica set.
@@ -151,7 +133,6 @@ module Mongo
 
       # No connection manager by default.
       @manager = nil
-      @old_managers = []
 
       # Lock for request ids.
       @id_lock = Mutex.new
@@ -183,15 +164,26 @@ module Mongo
     # Initiate a connection to the replica set.
     def connect
       log(:info, "Connecting...")
-      @connect_mutex.synchronize do
-        return if @connected
 
-        seeds = @manager.nil? ? @seeds : @manager.seeds
-        @manager = PoolManager.new(self, seeds)
+      # Prevent recursive connection attempts from the same thread.
+      # This is done rather than using a Monitor to prevent potentially recursing
+      # infinitely while attempting to connect and continually failing. Instead, fail fast.
+      raise ConnectionFailure, "Failed to get node data." if thread_local[:locks][:connecting] == true
 
-        thread_local[:managers][self] = @manager
-
-        @manager.connect
+      @connect_mutex.synchronize do
+        return if @connected
+        begin
+          thread_local[:locks][:connecting] = true
+          if @manager
+            @manager.refresh! @seeds
+          else
+            @manager = PoolManager.new(self, @seeds)
+            thread_local[:managers][self] = @manager
+            @manager.connect
+          end
+        ensure
+          thread_local[:locks][:connecting] = false
+        end
         @refresh_version += 1
 
         if @manager.pools.empty?
@@ -235,15 +227,7 @@ module Mongo
     #   to get the refresh lock.
     def hard_refresh!
       log(:info, "Initiating hard refresh...")
-      discovered_seeds = @manager.seeds
-      new_manager = PoolManager.new(self, discovered_seeds | @seeds)
-      new_manager.connect
-
-      thread_local[:managers][self] = new_manager
-
-      # TODO: make sure that connect has succeeded
-      @old_managers << @manager
-      @manager = new_manager
+      @manager.refresh! @seeds
 
       @refresh_version += 1
       return true
@@ -286,6 +270,7 @@ module Mongo
     def read_primary?
       @manager.read_pool == @manager.primary_pool
     end
+    alias :primary? :read_primary?
 
     # Close the connection to the database.
     def close(opts={})
@@ -343,12 +328,11 @@ module Mongo
       end
 
       if socket
-        socket
+        return socket
       else
         @connected = false
         raise ConnectionFailure.new("Could not checkout a socket.")
       end
-      socket
     end
 
     def checkout_reader(mode=@read, tag_sets=@tag_sets, acceptable_latency=@acceptable_latency)
@@ -368,7 +352,7 @@ module Mongo
     # Checkin a socket used for reading.
     def checkin(socket)
       if socket && socket.pool
-        socket.pool.checkin(socket)
+        socket.checkin
       end
       sync_refresh
     end
@@ -435,11 +419,13 @@ module Mongo
     end
 
     def max_bson_size
-      if local_manager && local_manager.max_bson_size
-        local_manager.max_bson_size
-      else
-        Mongo::DEFAULT_MAX_BSON_SIZE
-      end
+      return local_manager.max_bson_size if local_manager
+      DEFAULT_MAX_BSON_SIZE
+    end
+
+    def max_message_size
+      return local_manager.max_message_size if local_manager
+      DEFAULT_MAX_MESSAGE_SIZE
     end
 
     private
@@ -480,18 +466,6 @@ module Mongo
       super opts
     end
 
-    def prune_managers
-      @old_managers.each do |manager|
-        if manager != @manager
-          if manager.closed?
-            @old_managers.delete(manager)
-          else
-            manager.close(:soft => true)
-          end
-        end
-      end
-    end
-
     def sync_refresh
       if @refresh_mode == :sync &&
         ((Time.now - @last_refresh) > @refresh_interval)
@@ -501,7 +475,6 @@ module Mongo
         if @refresh_mutex.try_lock
           begin
             refresh
-            prune_managers
           ensure
             @refresh_mutex.unlock
           end

data/lib/mongo/mongo_sharded_client.rb

@@ -1,21 +1,3 @@
-# encoding: UTF-8
-
-# --
-# Copyright (C) 2008-2012 10gen 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
 
   # Instantiates and manages connections to a MongoDB sharded cluster for high availability.
@@ -34,11 +16,8 @@ module Mongo
 
       if nodes.empty? and ENV.has_key?('MONGODB_URI')
         parser = URIParser.new ENV['MONGODB_URI']
-        if parser.direct?
-          raise MongoArgumentError, "Mongo::MongoShardedClient.new called with no arguments, but ENV['MONGODB_URI'] implies a direct connection."
-        end
         opts = parser.connection_options.merge! opts
-        nodes = [parser.nodes]
+        nodes = parser.node_strings
       end
 
       unless nodes.length > 0
@@ -59,7 +38,6 @@ module Mongo
 
       # No connection manager by default.
       @manager = nil
-      @old_managers = []
 
       # Lock for request ids.
       @id_lock = Mutex.new
@@ -80,7 +58,7 @@ module Mongo
     end
 
     def valid_opts
-      GENERIC_OPTS + SHARDED_CLUSTER_OPTS
+      GENERIC_OPTS + SHARDED_CLUSTER_OPTS + READ_PREFERENCE_OPTS + WRITE_CONCERN_OPTS
     end
 
     def inspect
@@ -92,14 +70,26 @@ module Mongo
     def connect(force = !@connected)
       return unless force
       log(:info, "Connecting...")
-      @connect_mutex.synchronize do
-        discovered_seeds = @manager ? @manager.seeds : []
-        @old_managers << @manager if @manager
-        @manager = ShardingPoolManager.new(self, discovered_seeds | @seeds)
 
-        thread_local[:managers][self] = @manager
+      # Prevent recursive connection attempts from the same thread.
+      # This is done rather than using a Monitor to prevent potentially recursing
+      # infinitely while attempting to connect and continually failing. Instead, fail fast.
+      raise ConnectionFailure, "Failed to get node data." if thread_local[:locks][:connecting]
+
+      @connect_mutex.synchronize do
+        begin
+          thread_local[:locks][:connecting] = true
+          if @manager
+            @manager.refresh! @seeds
+          else
+            @manager = ShardingPoolManager.new(self, @seeds)
+            thread_local[:managers][self] = @manager
+            @manager.connect
+          end
+        ensure
+          thread_local[:locks][:connecting] = false
+        end
 
-        @manager.connect
         @refresh_version += 1
         @last_refresh = Time.now
         @connected = true
@@ -134,27 +124,25 @@ module Mongo
     end
 
     def checkout(&block)
-      2.times do
-        if connected?
-          sync_refresh
-        else
-          connect
-        end
-
-        begin
-          socket = block.call
-        rescue => ex
-          checkin(socket) if socket
-          raise ex
-        end
-
-        if socket
-          return socket
-        else
-          @connected = false
-          #raise ConnectionFailure.new("Could not checkout a socket.")
-        end
+      tries = 0
+      begin
+        super(&block)
+      rescue ConnectionFailure
+        tries +=1
+        tries < 2 ? retry : raise
       end
     end
+
+    # Initialize a connection to MongoDB using the MongoDB URI spec.
+    #
+    # @param uri [ String ]  string of the format:
+    #   mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/database]
+    #
+    # @param opts [ Hash ] Any of the options available for MongoShardedClient.new
+    #
+    # @return [ Mongo::MongoShardedClient ] The sharded client.
+    def self.from_uri(uri = ENV['MONGODB_URI'], options = {})
+      URIParser.new(uri).connection(options, false, true)
+    end
   end
 end