Skip to content

Wait for collision worker retirement before the missing-owner retry #1171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zzet merged 1 commit into from
Oct 28, 2026
Merged

Wait for collision worker retirement before the missing-owner retry #1171

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions internal/mcp/tools_multi_track_deadline_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,16 +134,27 @@ func TestTrackRepositoryPrefixCollisionNamesMCPParameter(t *testing.T) {
req.Params.Arguments = map[string]any{"path": second}
res, err := srv.handleTrackRepository(t.Context(), req)
require.NoError(t, err)
require.True(t, res.IsError)
require.NotNil(t, res)
text := extractTextFromContent(t, res.Content)
require.True(t, res.IsError, "expected prefix collision, got: %s", text)
require.Contains(t, text, "name parameter")
require.NotContains(t, text, "gortex track --name")
require.Contains(t, text, first)
// The buffered result can arrive before the producer's deferred cleanup.
// Wait for this exact failed track worker to retire before changing the
// owner fixture and exercising a fresh missing-owner collision request.
absSecond, err := filepath.Abs(second)
require.NoError(t, err)
require.Eventually(t, func() bool {
_, busy := srv.trackInFlight.Load(absSecond)
return !busy
}, 5*time.Second, time.Millisecond, "first collision worker must retire before retry")
require.NoError(t, os.RemoveAll(first))
res, err = srv.handleTrackRepository(t.Context(), req)
require.NoError(t, err)
require.True(t, res.IsError)
require.NotNil(t, res)
text = extractTextFromContent(t, res.Content)
require.True(t, res.IsError, "expected missing-owner collision, got: %s", text)
require.Contains(t, text, "no longer exists")
require.Contains(t, text, "untrack_repository")
}
Expand Down
Loading