Merge pull request #337 from mongoid/connection-ip-issues

Connection ip issues

Guardfile

@@ -2,7 +2,7 @@
 guard(
   "rspec",
   all_after_pass: false,
-  cli: "--fail-fast --tty --format documentation --colour") do
+  cmd: "bundle exec rspec --fail-fast --tty --format documentation --colour") do
 
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$}) { |match| "spec/#{match[1]}_spec.rb" }

lib/moped/address.rb

@@ -46,6 +46,7 @@ def initialize(address, timeout)
     # @since 2.0.0
     def resolve(node)
       begin
+        return @resolved if @resolved
         Timeout::timeout(@timeout) do
           Resolv.each_address(host) do |ip|
             if ip =~ Resolv::IPv4::Regex
@@ -55,7 +56,7 @@ def resolve(node)
           end
           raise Resolv::ResolvError unless @ip
         end
-        @resolved ||= "#{ip}:#{port}"
+        @resolved = "#{ip}:#{port}"
       rescue Timeout::Error, Resolv::ResolvError, SocketError
         Loggable.warn("  MOPED:", "Could not resolve IP for: #{original}", "n/a")
         node.down! and false

lib/moped/connection/manager.rb

@@ -35,6 +35,26 @@ def pool(node)
         end
       end
 
+      # Shutdown the connection pool for the provided node. In the case of
+      # unresolved IP addresses the resolved address would be nil resulting in
+      # the same pool for all nodes that did not have IP resolved.
+      #
+      # @example Shut down the connection pool.
+      #   Manager.shutdown(node)
+      #
+      # @param [ Node ] node The node.
+      #
+      # @return [ nil ] Always nil.
+      #
+      # @since 2.0.3
+      def shutdown(node)
+        MUTEX.synchronize do
+          pool = pools.delete(node.address.resolved)
+          pool.shutdown{ |conn| conn.disconnect } if pool
+          nil
+        end
+      end
+
       private
 
       # Create a new connection pool for the provided node.

lib/moped/node.rb

@@ -137,7 +137,7 @@ def down?
     #
     # @since 1.2.0
     def disconnect
-      connection{ |conn| conn.disconnect } if address.resolved
+      connection{ |conn| conn.disconnect }
       true
     end
 
@@ -150,9 +150,10 @@ def disconnect
     #
     # @since 2.0.0
     def down!
+      @pool = Connection::Manager.shutdown(self)
       @down_at = Time.new
       @latency = nil
-      disconnect
+      true
     end
 
     # Yields the block if a connection can be established, retrying when a
@@ -185,7 +186,6 @@ def ensure_connected(&block)
       ensure
         end_execution(:connection)
       end
-
     end
 
     # Set a flag on the node for the duration of provided block so that an

spec/moped/node_spec.rb

@@ -63,6 +63,18 @@
     end
   end
 
+  pending '#down!' do
+
+    before do
+      node.connected?
+      node.down!
+    end
+
+    it 'clears out the connection pool' do
+      expect(node.instance_variable_get(:@pool)).to be_nil
+    end
+  end
+
   describe "#latency" do
 
     let(:node) do