Adding needed changes to adhere to spec + fixing srv_max_hosts bug

Author: kyleburgess2025

lib/mongo/srv/monitor.rb

@@ -72,7 +72,11 @@ def do_work
       def scan!
         begin
           last_result = Timeout.timeout(timeout) do
-            @resolver.get_records(@srv_uri.query_hostname)
+            @resolver.get_records(
+              @srv_uri.query_hostname, 
+              @srv_uri.uri_options[:srv_service_name] || options[:srv_service_name],
+              @srv_uri.uri_options[:srv_max_hosts] || @options[:srv_max_hosts]
+            )
           end
         rescue Resolv::ResolvTimeout => e
           log_warn("SRV monitor: timed out trying to resolve hostname #{@srv_uri.query_hostname}: #{e.class}: #{e}")

lib/mongo/srv/resolver.rb

@@ -61,6 +61,20 @@ def timeout
         options[:timeout] || Monitor::DEFAULT_TIMEOUT
       end
 
+      # Fisher-Yates shuffling algorithm helper
+      # @param [ Array ] array The array to shuffle
+      # @return [ Array ] The shuffled array
+      # @api private
+      def shuffle(array)
+        a = array.dup
+        n = a.length
+        (n - 1).downto(1) do |i|
+          j = rand(i + 1)
+          a[i], a[j] = a[j], a[i]
+        end
+        a
+      end
+      
       # Obtains all of the SRV records for a given hostname. If a srv_max_hosts
       # is specified and it is greater than 0, return maximum srv_max_hosts records.
       #
@@ -114,7 +128,7 @@ def get_records(hostname, srv_service_name=nil, srv_max_hosts=nil)
 
         # if srv_max_hosts is in [1, #addresses)
         if (1...result.address_strs.length).include? srv_max_hosts
-          sampled_records = resources.shuffle.first(srv_max_hosts)
+          sampled_records = shuffle(resources).first(srv_max_hosts)
           result = Srv::Result.new(hostname)
           sampled_records.each { |record| result.add_record(record) }
         end

lib/mongo/uri/srv_protocol.rb

@@ -122,11 +122,13 @@ def raise_invalid_error!(details)
       end
 
       # Gets the SRV resolver.
+      # If domain verification fails or no SRV records are found,
+      # an error must not be raised per the spec; instead, a warning is logged.
       #
       # @return [ Mongo::Srv::Resolver ]
       def resolver
         @resolver ||= Srv::Resolver.new(
-          raise_on_invalid: true,
+          raise_on_invalid: false,
           resolv_options: options[:resolv_options],
           timeout: options[:connect_timeout],
         )
@@ -149,7 +151,11 @@ def parse!(remaining)
 
         log_debug "attempting to resolve #{hostname}"
 
-        @srv_result = resolver.get_records(hostname, uri_options[:srv_service_name], uri_options[:srv_max_hosts])
+        @srv_result = resolver.get_records(
+          hostname, 
+          uri_options[:srv_service_name] || options[:srv_service_name], 
+          uri_options[:srv_max_hosts] || options[:srv_max_hosts]
+        )
         if srv_result.empty?
           raise Error::NoSRVRecords.new(NO_SRV_RECORDS % hostname)
         end