github-starred/ollama
2
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2026-05-07 00:22:43 -05:00
Code Issues 14.5k Packages Projects Releases 120 Wiki Activity

[PR #14840] [MERGED] runner: fix swallowed error in allocModel graph reservation #61566

New Issue
Closed
opened 2026-04-29 16:38:30 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-29 16:38:30 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/14840
Author: @mango766
Created: 3/14/2026
Status: ✅ Merged
Merged: 3/16/2026
Merged by: @jessegross

Base: main ← Head: fix/allocmodel-swallowed-error

📝 Commits (1)

  • 476ee19 runner: fix swallowed error in allocModel graph reservation

📊 Changes

1 file changed (+1 additions, -1 deletions)

View changed files

📝 runner/ollamarunner/runner.go (+1 -1)

📄 Description

Summary

Fixes #14839

allocModel() silently discards the error from the first reserveWorstCaseGraph(true) call by returning nil instead of err. This means a failed prompt graph reservation goes unnoticed — the model appears to load successfully but may behave unexpectedly during inference.

Before (bug):

err = s.reserveWorstCaseGraph(true)
if err != nil {
    return nil  // error swallowed
}

After (fix):

err = s.reserveWorstCaseGraph(true)
if err != nil {
    return err  // error properly propagated
}

The second call reserveWorstCaseGraph(false) already returns its error correctly, so this was likely a typo.

Test plan

  • Verified the fix is a single-character change (nil -> err) with no side effects
  • Existing tests continue to pass (the change only affects the error path)
  • Under memory pressure, allocModel now correctly reports failure instead of silently proceeding

🤖 Generated with Claude Code

🔄 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/14840 **Author:** [@mango766](https://github.com/mango766) **Created:** 3/14/2026 **Status:** ✅ Merged **Merged:** 3/16/2026 **Merged by:** [@jessegross](https://github.com/jessegross) **Base:** `main` ← **Head:** `fix/allocmodel-swallowed-error` --- ### 📝 Commits (1) - [`476ee19`](https://github.com/ollama/ollama/commit/476ee19ae9e09a70a8753d7fb6e11e9220f148b6) runner: fix swallowed error in allocModel graph reservation ### 📊 Changes **1 file changed** (+1 additions, -1 deletions) <details> <summary>View changed files</summary> 📝 `runner/ollamarunner/runner.go` (+1 -1) </details> ### 📄 Description ## Summary Fixes #14839 `allocModel()` silently discards the error from the first `reserveWorstCaseGraph(true)` call by returning `nil` instead of `err`. This means a failed prompt graph reservation goes unnoticed — the model appears to load successfully but may behave unexpectedly during inference. **Before (bug):** ```go err = s.reserveWorstCaseGraph(true) if err != nil { return nil // error swallowed } ``` **After (fix):** ```go err = s.reserveWorstCaseGraph(true) if err != nil { return err // error properly propagated } ``` The second call `reserveWorstCaseGraph(false)` already returns its error correctly, so this was likely a typo. ## Test plan - [x] Verified the fix is a single-character change (`nil` -> `err`) with no side effects - [ ] Existing tests continue to pass (the change only affects the error path) - [ ] Under memory pressure, `allocModel` now correctly reports failure instead of silently proceeding 🤖 Generated with [Claude Code](https://claude.com/claude-code) --- <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-29 16:38:30 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
amd
api
app
bug
build
cli
cloud
compatibility
context-length
create
docker
documentation
embeddings
feature request
feedback wanted
good first issue
gpt-oss
gpu
harmony
help wanted
image
install
intel
js
launch
linux
macos
memory
mlx
model
needs more info
networking
nvidia
ollama.com
performance
pull-request
Mirrored from GitHub Pull Request
 python
question
registry
rendering
thinking
tools
top
vulkan
windows
wsl
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/ollama#61566
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?