95ac33fc4f
Stefan Eissing
2025-10-02
Subject
ip-happy: prevent event-based stall on retry
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
lib/cf-ip-happy.c+10 -4
| @@ -461,10 +461,10 @@ evaluate: | |
| else if(inconclusive) { | |
| /* tried all addresses, no success but some where inconclusive. | |
| * Let's restart the inconclusive ones. */ | |
| - | if(curlx_timediff(now, bs->last_attempt_started) >= |
| - | bs->attempt_delay_ms) { |
| - | CURL_TRC_CF(data, cf, "tried all addresses with inconclusive results" |
| - | ", restarting one"); |
| + | timediff_t since_ms = curlx_timediff(now, bs->last_attempt_started); |
| + | timediff_t delay_ms = bs->attempt_delay_ms - since_ms; |
| + | if(delay_ms <= 0) { |
| + | CURL_TRC_CF(data, cf, "all attempts inconclusive, restarting one"); |
| i = -1; | |
| for(a = bs->running; a; a = a->next) { | |
| ++i; | |
| @@ -479,6 +479,12 @@ evaluate: | |
| } | |
| DEBUGASSERT(0); /* should not come here */ | |
| } | |
| + | else { |
| + | /* let's wait some more before restarting */ |
| + | infof(data, "connect attempts inconclusive, retrying " |
| + | "in %" FMT_TIMEDIFF_T "ms", delay_ms); |
| + | Curl_expire(data, delay_ms, EXPIRE_HAPPY_EYEBALLS); |
| + | } |
| /* attempt timeout for restart has not expired yet */ | |
| goto out; | |
| } | |