moped 1.2.1 → 1.2.2

data/CHANGELOG.md

@@ -4,10 +4,20 @@
 
 ### New Features
 
-## 1.2.2 (branch: 1.2.0-stable)
+## 1.2.2
 
 ### Resolved Issues
 
+* \#73 Raise a `Moped::Errors::CursorNotFound` on long running queries where
+  the cursor was killed by the server. (Marius Podwyszynski)
+
+* \#72 Reauthenticate properly when an `rs.stepDown()` occurs in the middle of
+  cursor execution.
+
+* \#71 When DNS cannot resolve on node initialization, the node will be flagged
+  as down instead of raising a `SocketError`. On subsequent refreshes Moped will
+  attempt to resolve the DNS again to determine if the node can be brought up.
+
 ## 1.2.1
 
 ### Resolved Issues

data/lib/moped/errors.rb

@@ -97,6 +97,13 @@ module Moped
     # Exception raised on invalid queries.
     class QueryFailure < MongoError; end
 
+    # Exception raised if the cursor could not be found.
+    class CursorNotFound < MongoError
+      def initialize(operation, cursor_id)
+        super(operation, {"errmsg" => "cursor #{cursor_id} not found"})
+      end
+    end
+
     # @api private
     #
     # Internal exception raised by Node#ensure_primary and captured by

data/lib/moped/node.rb

@@ -125,7 +125,7 @@ module Moped
         # Someone else wrapped this in an #ensure_primary block, so let the
         # reconfiguration exception bubble up.
         raise
-      rescue Errors::OperationFailure, Errors::AuthenticationFailure, Errors::QueryFailure
+      rescue Errors::OperationFailure, Errors::AuthenticationFailure, Errors::QueryFailure, Errors::CursorNotFound
         # These exceptions are "expected" in the normal course of events, and
         # don't necessitate disconnecting.
         raise
@@ -179,12 +179,15 @@ module Moped
     # @param [ Collection ] collection The collection to get more from.
     # @param [ Integer ] cursor_id The id of the cursor on the server.
     # @param [ Integer ] limit The number of documents to limit.
+    # @raise [ CursorNotFound ] if the cursor has been killed
     #
     # @return [ Message ] The result of the operation.
     #
     # @since 1.0.0
     def get_more(database, collection, cursor_id, limit)
-      process(Protocol::GetMore.new(database, collection, cursor_id, limit))
+      reply = process(Protocol::GetMore.new(database, collection, cursor_id, limit))
+      raise Moped::Errors::CursorNotFound.new("GET MORE", cursor_id) if reply.cursor_not_found?
+      reply
     end
 
     # Get the hash identifier for the node.
@@ -209,17 +212,12 @@ module Moped
     # @since 1.0.0
     def initialize(address)
       @address = address
-
-      host, port = address.split(":")
-      @ip_address = ::Socket.getaddrinfo(host, nil, ::Socket::AF_INET, ::Socket::SOCK_STREAM).first[3]
-      @port = port.to_i
-      @resolved_address = "#{@ip_address}:#{@port}"
-
       @timeout = 5
       @down_at = nil
       @refreshed_at = nil
       @primary = nil
       @secondary = nil
+      resolve_address
     end
 
     # Insert documents into the database.
@@ -340,9 +338,20 @@ module Moped
     def query(database, collection, selector, options = {})
       operation = Protocol::Query.new(database, collection, selector, options)
 
-      process operation do |reply|
-        if reply.flags.include?(:query_failure)
-          raise Errors::QueryFailure.new(operation, reply.documents.first)
+      process(operation) do |reply|
+        if reply.query_failed?
+          if reply.unauthorized? && auth.has_key?[database]
+            # If we got here, most likely this is the case of Moped
+            # authenticating successfully against the node originally, but the
+            # node has been reset or gone down and come back up. The most
+            # common case here is a rs.stepDown() which will reinitialize the
+            # connection. In this case we need to requthenticate and try again,
+            # otherwise we'll just raise the error to the user.
+            login(database, *auth[database])
+            query(database, collection, selector, options)
+          else
+            raise Errors::QueryFailure.new(operation, reply.documents.first)
+          end
         end
         reply
       end
@@ -363,25 +372,27 @@ module Moped
     #
     # @since 1.0.0
     def refresh
-      info = command("admin", ismaster: 1)
-
-      @refreshed_at = Time.now
-      primary = true if info["ismaster"]
-      secondary = true if info["secondary"]
-
-      peers = []
-      peers.push(info["primary"]) if info["primary"]
-      peers.concat(info["hosts"]) if info["hosts"]
-      peers.concat(info["passives"]) if info["passives"]
-      peers.concat(info["arbiters"]) if info["arbiters"]
-
-      @peers = peers.map { |peer| Node.new(peer) }
-      @primary, @secondary = primary, secondary
-      @arbiter = info["arbiterOnly"]
-      @passive = info["passive"]
-
-      if !primary && Threaded.executing?(:ensure_primary)
-        raise Errors::ReplicaSetReconfigured, "#{inspect} is no longer the primary node."
+      if resolve_address
+        info = command("admin", ismaster: 1)
+
+        @refreshed_at = Time.now
+        primary = true if info["ismaster"]
+        secondary = true if info["secondary"]
+
+        peers = []
+        peers.push(info["primary"]) if info["primary"]
+        peers.concat(info["hosts"]) if info["hosts"]
+        peers.concat(info["passives"]) if info["passives"]
+        peers.concat(info["arbiters"]) if info["arbiters"]
+
+        @peers = peers.map { |peer| Node.new(peer) }
+        @primary, @secondary = primary, secondary
+        @arbiter = info["arbiterOnly"]
+        @passive = info["passive"]
+
+        if !primary && Threaded.executing?(:ensure_primary)
+          raise Errors::ReplicaSetReconfigured, "#{inspect} is no longer the primary node."
+        end
       end
     end
 
@@ -548,5 +559,28 @@ module Moped
         logger.debug indent + last.log_inspect + runtime
       end
     end
+
+    def resolve_address
+      unless ip_address
+        begin
+          parse_address and true
+        rescue SocketError
+          if logger = Moped.logger
+            logger.warn " MOPED: Could not resolve IP address for #{address}"
+          end
+          @down_at = Time.new
+          false
+        end
+      else
+        true
+      end
+    end
+
+    def parse_address
+      host, port = address.split(":")
+      @port = port.to_i
+      @ip_address = ::Socket.getaddrinfo(host, nil, ::Socket::AF_INET, ::Socket::SOCK_STREAM).first[3]
+      @resolved_address = "#{@ip_address}:#{@port}"
+    end
   end
 end

data/lib/moped/protocol/reply.rb

@@ -13,6 +13,8 @@ module Moped
     class Reply
       include Message
 
+      UNAUTHORIZED = 10057
+
       # @attribute
       # @return [Number] the length of the message
       int32 :length
@@ -53,6 +55,18 @@ module Moped
 
       finalize
 
+      def cursor_not_found?
+        flags.include?(:cursor_not_found)
+      end
+
+      def query_failed?
+        flags.include?(:query_failure)
+      end
+
+      def unauthorized?
+        documents.first["code"] == UNAUTHORIZED
+      end
+
       class << self
 
         # Consumes a buffer, returning the deserialized Reply message.

data/lib/moped/query.rb

@@ -202,9 +202,12 @@ module Moped
       command[:fields] = operation.fields if operation.fields
       command[:update] = change unless options[:remove]
 
-      session.with(consistency: :strong) do |sess|
+      result = session.with(consistency: :strong) do |sess|
         sess.command(command)["value"]
       end
+
+      # Keeping moped compatibility with mongodb >= 2.2.0-rc0
+      options[:upsert] && !result ? [] : result
     end
 
     # Remove a single document matching the query's selector.

data/lib/moped/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Moped
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moped
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-27 00:00:00.000000000 Z
+date: 2012-09-16 00:00:00.000000000 Z
 dependencies: []
 description: A MongoDB driver for Ruby.
 email:
@@ -85,7 +85,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3114748466186243780
+      hash: 3008607768252365192
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3114748466186243780
+      hash: 3008607768252365192
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24