fix(ollama): make retry loop actually retry all transient errors#872
Merged
Conversation
Most error paths in ollama_pull_if_needed used the ? operator which immediately returned from the function, bypassing the retry loop entirely. Only one specific PullResponse::Err case was actually retried. - Replace ? operators with match arms that set last_err and continue - Replace std::thread::sleep with tokio::time::sleep to avoid blocking the async runtime - Make HTTP status errors retryable instead of returning immediately - Make stream read errors and JSON parse errors retryable - Make streaming "error" status retryable - Move sleep to top of loop so all retry paths get the 2s backoff - Use api_base() for delete endpoint instead of hardcoded URL Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> Signed-off-by: Nick Mitchell <nickm@us.ibm.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Summary
ollama_pull_if_neededretry loop where most error paths used?operator to immediately return, bypassing all 5 retry attemptsstd::thread::sleepwith asynctokio::time::sleepto avoid stalling the tokio runtime (especially problematic in CI with single-threaded runtimes)api_base()insteadTest plan
cargo checkandcargo fmtpass (confirmed locally)🤖 Generated with Claude Code