clawdie/zot
1
0
Fork 0
mirror of https://github.com/patriceckhart/zot.git synced 2026-06-26 21:36:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(extensions): close ext.commands / ext.tools / lastFrameTime races

Browse source 
CI's `go test -race` flagged two races introduced over the recent
extension work:

1. ext.commands / ext.tools were appended to from the read-loop
   goroutine without a lock, while Commands() / Tools() / HasCommand
   read them under m.mu. Same for the toolIndex pre-check. Fix:
   take m.mu around the appends and the index dedup so writers and
   readers serialise on the same lock.

2. assumeReadyAfterIdle read ext.lastFrameTime once on entry without
   the per-extension lock (the read inside the loop already had it).
   Fix: take ext.mu for the initial snapshot too.

Verified locally with `go test -race ./...`; all packages pass.
The corresponding CI run for the scratchpad-persistence commit
failed for exactly these two races on linux + macos.
This commit is contained in:
patriceckhart 2026-04-19 15:27:09 +02:00
parent 463c62daf3
commit 744685d68d
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
internal/agent/extensions/manager.go
View file

@ -448,7 +448,9 @@ func (m *Manager) spawn(ctx context.Context, ext *Extension) error {
const readyIdleWindow = 250 * time.Millisecond
func (m *Manager) assumeReadyAfterIdle(ext *Extension) {
ext.mu.Lock()
last := ext.lastFrameTime
ext.mu.Unlock()
for {
select {
case <-ext.readyCh:
@ -507,8 +509,12 @@ func (m *Manager) readLoop(ext *Extension, scanner *bufio.Scanner) {
case "register_command":
var rc extproto.RegisterCommandFromExt
if err := json.Unmarshal(line, &rc); err == nil {
ext.commands = append(ext.commands, rc)
// Both ext.commands and m.commandIndex are read by
// the public Commands() / HasCommand() helpers under
// m.mu, so the writes have to take the same lock to
// keep the race detector happy.
m.mu.Lock()
ext.commands = append(ext.commands, rc)
if _, exists := m.commandIndex[rc.Name]; !exists {
m.commandIndex[rc.Name] = ext
}
@ -529,8 +535,8 @@ func (m *Manager) readLoop(ext *Extension, scanner *bufio.Scanner) {
continue
}
}
ext.tools = append(ext.tools, rt)
m.mu.Lock()
ext.tools = append(ext.tools, rt)
if _, exists := m.toolIndex[rt.Name]; !exists {
m.toolIndex[rt.Name] = ext
}