steve/llama-swap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

proxy: fix data race in /running endpoint and typo in error message (#748)

Browse Source 
## Problem

The `/running` endpoint in `listRunningProcessesHandler` reads
`process.state` directly without holding `stateMutex`. Meanwhile,
`swapState()` writes to `process.state` while holding the write lock.
This is a data race flagged by the Go race detector.

Also fixes a minor typo: "processes was in state" → "process was in
state".

## Fix

- `proxymanager.go`: Replace `process.state` with
`process.CurrentState()` which acquires `stateMutex.RLock()` before
reading.
- `process.go`: Fix typo in error message.

## Verification

- `gofmt -l` — clean
- `go test -run "TestProcessGroup_|TestProxyManager_" ./proxy/` — all
pass
- `go test ./proxy/config/... ./proxy/cache/...
./proxy/configwatcher/...` — all pass
This commit is contained in:
Abdulazez A.
2026-05-11 22:49:18 +03:00
committed by GitHub
parent 2be3416baa
commit 085b54bc88
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
proxy/process.go
+1 -1
View File
@@ -304,7 +304,7 @@ func (p *Process) start() error {
return fmt.Errorf("process was already starting but wound up in state %v", state) return fmt.Errorf("process was already starting but wound up in state %v", state)
} }
} else { } else {
return fmt.Errorf("processes was in state %v when start() was called", curState) return fmt.Errorf("process was in state %v when start() was called", curState)
} }
} else { } else {
return fmt.Errorf("failed to set Process state to starting: current state: %v, error: %v", curState, err) return fmt.Errorf("failed to set Process state to starting: current state: %v, error: %v", curState, err)
proxy/proxymanager.go
+2 -2
View File
@@ -1173,7 +1173,7 @@ func (pm *ProxyManager) listRunningProcessesHandler(context *gin.Context) {
if process, ok := pm.matrix.GetProcess(modelID); ok { if process, ok := pm.matrix.GetProcess(modelID); ok {
runningProcesses = append(runningProcesses, gin.H{ runningProcesses = append(runningProcesses, gin.H{
"model": process.ID, "model": process.ID,
"state": process.state, "state": process.CurrentState(),
"cmd": process.config.Cmd, "cmd": process.config.Cmd,
"proxy": process.config.Proxy, "proxy": process.config.Proxy,
"ttl": process.config.UnloadAfter, "ttl": process.config.UnloadAfter,
@@ -1188,7 +1188,7 @@ func (pm *ProxyManager) listRunningProcessesHandler(context *gin.Context) {
if process.CurrentState() == StateReady { if process.CurrentState() == StateReady {
runningProcesses = append(runningProcesses, gin.H{ runningProcesses = append(runningProcesses, gin.H{
"model": process.ID, "model": process.ID,
"state": process.state, "state": process.CurrentState(),
"cmd": process.config.Cmd, "cmd": process.config.Cmd,
"proxy": process.config.Proxy, "proxy": process.config.Proxy,
"ttl": process.config.UnloadAfter, "ttl": process.config.UnloadAfter,