Skip to content

Get up and running with Kimi, GLM, MiniMax, DeepSeek, gpt-oss, Qwen, Gemma and other models.

removeall to remove non-empty temp dirs

Michael Yanged6c8bfe57e4
diff --git a/gpu/assets.go b/gpu/assets.go
index a35b6630b..1c33b55bb 100644
--- a/gpu/assets.go
+++ b/gpu/assets.go
@@ -67,37 +67,44 @@ func PayloadsDir() (string, error) {
// Best effort to clean up prior tmpdirs
func cleanupTmpDirs() {
- dirs, err := filepath.Glob(filepath.Join(os.TempDir(), "ollama*"))
+ matches, err := filepath.Glob(filepath.Join(os.TempDir(), "ollama*", "ollama.pid"))
if err != nil {
return
}
- for _, d := range dirs {
- info, err := os.Stat(d)
- if err != nil || !info.IsDir() {
+
+ for _, match := range matches {
+ raw, err := os.ReadFile(match)
+ if errors.Is(err, os.ErrNotExist) {
+ slog.Debug("not a ollama runtime directory, skipping", "path", match)
continue
- }
- raw, err := os.ReadFile(filepath.Join(d, "ollama.pid"))
- if err != nil {
- slog.Warn("failed to read ollama.pid", "path", d, "error", err)
- // No pid, ignore this tmpdir
+ } else if err != nil {
+ slog.Warn("could not read ollama.pid, skipping", "path", match, "error", err)
continue
}
pid, err := strconv.Atoi(string(raw))
if err != nil {
- slog.Warn("failed to parse pid", "path", d, "error", err)
+ slog.Warn("invalid pid, skipping", "path", match, "error", err)
continue
}
- proc, err := os.FindProcess(pid)
- if err == nil && !errors.Is(proc.Signal(syscall.Signal(0)), os.ErrProcessDone) {
- slog.Warn("found running ollama", "pid", pid, "path", d)
- // Another running ollama, ignore this tmpdir
+ p, err := os.FindProcess(pid)
+ if err == nil && !errors.Is(p.Signal(syscall.Signal(0)), os.ErrProcessDone) {
+ slog.Warn("process still running, skipping", "pid", pid, "path", match)
continue
}
- if err := os.Remove(d); err != nil {
- slog.Warn("unable to cleanup stale tmpdir", "path", d, "error", err)
+ if err := os.Remove(match); err != nil {
+ slog.Warn("could not cleanup stale pidfile", "path", match, "error", err)
+ }
+
+ runners := filepath.Join(filepath.Dir(match), "runners")
+ if err := os.RemoveAll(runners); err != nil {
+ slog.Warn("could not cleanup stale runners", "path", runners, "error", err)
+ }
+
+ if err := os.Remove(filepath.Dir(match)); err != nil {
+ slog.Warn("could not cleanup stale tmpdir", "path", filepath.Dir(match), "error", err)
}
}
}