Move common retry_econnrefused function to xcp_client #6564
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Steven Woods <[email protected]>
snwoods
commented
Jul 1, 2025
| let rec retry_econnrefused f = | ||
| try f () with | ||
| | Unix.Unix_error (Unix.ECONNREFUSED, "connect", _) -> | ||
| (* debug "Caught ECONNREFUSED; retrying in 5s"; *) |
There was a problem hiding this comment.
This was commented out when moved from xenops_server_xen.ml to Storage_client.ml (the commit I mentioned in the description.) I'm not sure if it was considered spammy or if we'd be interested in it? It's been commented out for 12 years... :P
snwoods
commented
Jul 1, 2025
| (* debug "Caught ECONNREFUSED; retrying in 5s"; *) | ||
| Thread.delay 5. ; retry_econnrefused f | ||
| | e -> | ||
| (* error "Caught %s: does the service need restarting?" |
There was a problem hiding this comment.
We're raising the error anyway, so I don't know if this message adds any more context that we'd need?
snwoods
commented
Jul 1, 2025
| (Printexc.to_string e); *) | ||
| raise e | ||
|
|
||
| (* TODO: use_switch=false as the message switch doesn't handle raw HTTP very well *) |
There was a problem hiding this comment.
This was a TODO in the original code, but it's clearly never been TODONE.
robhoes
approved these changes
Jul 1, 2025
last-genius
approved these changes
Jul 1, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As per the commit message for fbda87d (12 years ago): "[ECONNREFUSED retry logic] probably should be pushed into the generic XCP function, since the same behaviour will probably be expected for other interfaces." and David was right!
Moving the functionality to Xcp_client.ml itself so that it isn't duplicated across 3 different clients.