Skip to content

Fix tyger run cancel race condition #154

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
johnstairs merged 1 commit into from
Nov 26, 2024
Merged

Fix tyger run cancel race condition #154

Show file tree
Hide file tree
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
4 changes: 0 additions & 4 deletions cli/integrationtest/controlplane_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1311,10 +1311,6 @@ func TestCancelJob(t *testing.T) {

runTygerSucceeds(t, "run", "cancel", runId)

// force the sweep to run to terminate the pod
_, err := controlplane.InvokeRequest(context.Background(), http.MethodPost, "v1/runs/_sweep", nil, nil)
require.NoError(err)

waitForRunCanceled(t, runId)

// Check that the run failed because it was canceled.
Expand Down
4 changes: 3 additions & 1 deletion cli/internal/cmd/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,9 @@ beginWatch:
}

end:
mainWg.Wait()
if runFailedErr == nil {
mainWg.Wait()
}

if logs {
// The run has completed and we have received all data. We just need to wait for the logs to finish streaming,
Expand Down
4 changes: 2 additions & 2 deletions server/ControlPlane/Database/Repository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ await _resiliencePipeline.ExecuteAsync(async cancellationToken =>
SELECT run
FROM runs
WHERE id = $1
AND status NOT IN ('Failed', 'Succeeded', 'Canceled')
AND status NOT IN ('Failed', 'Succeeded', 'Canceled', 'Canceling')
FOR UPDATE
""", conn)
{
Expand All @@ -550,7 +550,7 @@ FOR UPDATE
await using var reader = await readRun.ExecuteReaderAsync(cancellationToken);
if (!await reader.ReadAsync(cancellationToken))
{
// The run is already in a terminal state so we don't do anything
// The run is already in a terminal or canceling state so we don't do anything
return;
}

Expand Down