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 #4294] [MERGED] Harden subprocess reaping #42689

New Issue
Closed
opened 2026-04-24 22:25:51 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-24 22:25:51 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/4294
Author: @dhiltgen
Created: 5/9/2024
Status: ✅ Merged
Merged: 5/9/2024
Merged by: @dhiltgen

Base: main ← Head: harden_subprocess_reaping

📝 Commits (5)

  • bd54b08 Streamlined WaitUntilRunning
  • c942e4a Fixed startup sequence to report model loading
  • c496967 Merge branch 'ollama:main' into mannix-server
  • 920a4b0 Merge remote-tracking branch 'upstream/main' into pr3702
  • 84ac7ce Refine subprocess reaping

📊 Changes

2 files changed (+65 additions, -59 deletions)

View changed files

📝 llm/ext_server/server.cpp (+21 -21)
📝 llm/server.go (+44 -38)

📄 Description

This carries PR #3702

Changes for concurrency to wait for the subprocess to exit inadvertently regressed reaping if we crash during model load. This fixes that regression and refines the logging around subprocess startup.

🔄 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/4294 **Author:** [@dhiltgen](https://github.com/dhiltgen) **Created:** 5/9/2024 **Status:** ✅ Merged **Merged:** 5/9/2024 **Merged by:** [@dhiltgen](https://github.com/dhiltgen) **Base:** `main` ← **Head:** `harden_subprocess_reaping` --- ### 📝 Commits (5) - [`bd54b08`](https://github.com/ollama/ollama/commit/bd54b08261c15e927234d03e2b1020e528b38afe) Streamlined WaitUntilRunning - [`c942e4a`](https://github.com/ollama/ollama/commit/c942e4a07b91dc6b78bb245241ea514b752e3d4d) Fixed startup sequence to report model loading - [`c496967`](https://github.com/ollama/ollama/commit/c496967e5667b94059be607f495a3ee9f0b4cbb7) Merge branch 'ollama:main' into mannix-server - [`920a4b0`](https://github.com/ollama/ollama/commit/920a4b0794d997b46aac502560e7dc2860875e1f) Merge remote-tracking branch 'upstream/main' into pr3702 - [`84ac7ce`](https://github.com/ollama/ollama/commit/84ac7ce139252506d77115a3152f36a5a4f3541a) Refine subprocess reaping ### 📊 Changes **2 files changed** (+65 additions, -59 deletions) <details> <summary>View changed files</summary> 📝 `llm/ext_server/server.cpp` (+21 -21) 📝 `llm/server.go` (+44 -38) </details> ### 📄 Description This carries PR #3702 Changes for concurrency to wait for the subprocess to exit inadvertently regressed reaping if we crash during model load. This fixes that regression and refines the logging around subprocess startup. --- <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-24 22:25:51 -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#42689
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?