Merge pull request mongodb#777 from estolfo/connect-errors

Don't call ensure_connected from within #authenticate!, loop possible

Author: estolfo

lib/mongo/server/connection.rb

@@ -170,16 +170,13 @@ def authenticate!
       end
 
       def default_mechanism
-        ensure_connected do |socket|
-          read_with_one_retry do
-            socket.write(Monitor::Connection::ISMASTER_BYTES)
-            ismaster = Protocol::Reply.deserialize(socket, max_message_size).documents[0]
-            min_wire_version = ismaster[Description::MIN_WIRE_VERSION] || Description::LEGACY_WIRE_VERSION
-            max_wire_version = ismaster[Description::MAX_WIRE_VERSION] || Description::LEGACY_WIRE_VERSION
-            features = Description::Features.new(min_wire_version..max_wire_version)
-            (features.scram_sha_1_enabled? || @server.features.scram_sha_1_enabled?) ? :scram : :mongodb_cr
-          end
-        end
+        return (@server.features.scram_sha_1_enabled? ? :scram : :mongodb_cr) unless socket
+        socket.write(Monitor::Connection::ISMASTER_BYTES)
+        ismaster = Protocol::Reply.deserialize(socket, max_message_size).documents[0]
+        min_wire_version = ismaster[Description::MIN_WIRE_VERSION] || Description::LEGACY_WIRE_VERSION
+        max_wire_version = ismaster[Description::MAX_WIRE_VERSION] || Description::LEGACY_WIRE_VERSION
+        features = Description::Features.new(min_wire_version..max_wire_version)
+        (features.scram_sha_1_enabled? || @server.features.scram_sha_1_enabled?) ? :scram : :mongodb_cr
       end
 
       def write(messages, buffer = BSON::ByteBuffer.new)

spec/mongo/server/connection_spec.rb

@@ -118,7 +118,7 @@
         end
 
         let!(:error) do
-          e = begin; connection.connect!; rescue => ex; ex; end
+          e = begin; connection.send(:ensure_connected); rescue => ex; ex; end
         end
 
         it 'raises an error' do