Improve the conditions for clearing the Connection Attempt Delay upon connection failure

shioimm · shioimm · commit df5c8a77cdd7 · 2024-11-30T13:08:20.000+09:00
This change addresses a case that was overlooked in ruby#12087. In the previous change, the Connection Attempt Delay was cleared at the point of a connection failure only if both of the following conditions were met: - No other sockets were attempting a connection - There were addresses still available to start a new connection In this update, the second condition has been removed. As a result, if name resolution succeeds after a connection failure and new addresses are obtained, it will be able to immediately attempt a connection to one of them. If there are no sockets attempting a connection, no addresses available for connection, and name resolution has completed, an exception will still be raised as before.
diff --git a/ext/socket/ipsocket.c b/ext/socket/ipsocket.c
@@ -1003,9 +1003,7 @@ init_fast_fallback_inetsock_internal(VALUE v)
                 if (connected_fd >= 0) break;
 
                 if (!in_progress_fds(arg->connection_attempt_fds_size)) {
-                    if (any_addrinfos(&resolution_store)) {
-                        connection_attempt_delay_expires_at = NULL;
-                    } else if (resolution_store.is_all_finised) {
+                    if (!any_addrinfos(&resolution_store) && resolution_store.is_all_finised) {
                         if (local_status < 0) {
                             host = arg->local.host;
                             serv = arg->local.serv;
@@ -1019,6 +1017,7 @@ init_fast_fallback_inetsock_internal(VALUE v)
                             rsock_syserr_fail_host_port(last_error.ecode, syscall, host, serv);
                         }
                     }
+                    connection_attempt_delay_expires_at = NULL;
                     user_specified_connect_timeout_at = NULL;
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -1003,9 +1003,7 @@ init_fast_fallback_inetsock_internal(VALUE v)`
`1003`	`1003`	`if (connected_fd >= 0) break;`
`1004`	`1004`
`1005`	`1005`	`if (!in_progress_fds(arg->connection_attempt_fds_size)) {`
`1006`		`- if (any_addrinfos(&resolution_store)) {`
`1007`		`- connection_attempt_delay_expires_at = NULL;`
`1008`		`- } else if (resolution_store.is_all_finised) {`
	`1006`	`+ if (!any_addrinfos(&resolution_store) && resolution_store.is_all_finised) {`
`1009`	`1007`	`if (local_status < 0) {`
`1010`	`1008`	`host = arg->local.host;`
`1011`	`1009`	`serv = arg->local.serv;`
`@@ -1019,6 +1017,7 @@ init_fast_fallback_inetsock_internal(VALUE v)`
`1019`	`1017`	`rsock_syserr_fail_host_port(last_error.ecode, syscall, host, serv);`
`1020`	`1018`	`}`
`1021`	`1019`	`}`
	`1020`	`+ connection_attempt_delay_expires_at = NULL;`
`1022`	`1021`	`user_specified_connect_timeout_at = NULL;`
`1023`	`1022`	`}`
`1024`	`1023`	`}`