[PR #1199] [MERGED] Fix issues sending incomplete body and add retry backoff for ollama push #10502

Closed
opened 2026-04-12 23:01:56 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/1199
Author: @jmorganca
Created: 11/19/2023
Status: Merged
Merged: 11/19/2023
Merged by: @jmorganca

Base: mainHead: jmorganca/parts


📝 Commits (8)

  • edc4b89 adjust download/upload parts
  • a47fb57 upload: retry complete upload
  • 234910d exponential backoff up to 30s
  • 9fc9840 fix sending too little data in chunk upload body
  • 4ea9bf0 use exponential everywhere
  • fe875dc revert to using one open file for blob uploads
  • c229137 dont retry on upload complete context cancel
  • 2a4b52f add back part.Reset()

📊 Changes

2 files changed (+46 additions, -29 deletions)

View changed files

📝 server/download.go (+7 -8)
📝 server/upload.go (+39 -21)

📄 Description

Builds on #1184

This change increases the upload chunk sizes and adds more graceful retry backoffs to fix issues transient network issues when using ollama push.

It also fixes an issue where an incomplete body would be uploaded, requiring the need for a retry.


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/ollama/ollama/pull/1199 **Author:** [@jmorganca](https://github.com/jmorganca) **Created:** 11/19/2023 **Status:** ✅ Merged **Merged:** 11/19/2023 **Merged by:** [@jmorganca](https://github.com/jmorganca) **Base:** `main` ← **Head:** `jmorganca/parts` --- ### 📝 Commits (8) - [`edc4b89`](https://github.com/ollama/ollama/commit/edc4b89d80ee41a683737477c851d800f1626fc4) adjust download/upload parts - [`a47fb57`](https://github.com/ollama/ollama/commit/a47fb57f4492abc19646a5140f9649bcfb809159) upload: retry complete upload - [`234910d`](https://github.com/ollama/ollama/commit/234910dcb0db3d5e66ceafcaae529d7f6c0e23fe) exponential backoff up to 30s - [`9fc9840`](https://github.com/ollama/ollama/commit/9fc98402da1c3d7318492176bb3d183781b6adb8) fix sending too little data in chunk upload body - [`4ea9bf0`](https://github.com/ollama/ollama/commit/4ea9bf05d821fe401aac1b38d3972cd663359a2c) use exponential everywhere - [`fe875dc`](https://github.com/ollama/ollama/commit/fe875dc277b16fdd144a7dad5092882843636512) revert to using one open file for blob uploads - [`c229137`](https://github.com/ollama/ollama/commit/c2291377c146aa07a8f44ff0fdc5b042eed828fb) dont retry on upload complete context cancel - [`2a4b52f`](https://github.com/ollama/ollama/commit/2a4b52f13dc7402f55b35a1bb97ad014d72c3599) add back `part.Reset()` ### 📊 Changes **2 files changed** (+46 additions, -29 deletions) <details> <summary>View changed files</summary> 📝 `server/download.go` (+7 -8) 📝 `server/upload.go` (+39 -21) </details> ### 📄 Description Builds on #1184 This change increases the upload chunk sizes and adds more graceful retry backoffs to fix issues transient network issues when using `ollama push`. It also fixes an issue where an incomplete body would be uploaded, requiring the need for a retry. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-04-12 23:01:56 -05:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/ollama#10502