Skip to content

Allow the LocalBuildJobRunner to continue on task failure #1022

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

Open
pmachapman wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Allow the LocalBuildJobRunner to continue on task failure #1022

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
61 changes: 47 additions & 14 deletions src/Machine/src/Serval.Machine.Shared/Services/LocalBuildJobRunner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,22 +90,55 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
using IServiceScope scope = _serviceScopeFactory.CreateScope();
var engines = scope.ServiceProvider.GetRequiredService<IRepository<TEngine>>();

// Subscriptions are created before recovery so no changes are missed during the recovery window.
using ISubscription<TEngine> engineSub = await engines.SubscribeAsync(
e =>
e.CurrentBuild != null
&& e.CurrentBuild.BuildJobRunner == BuildJobRunnerType.Local
&& e.CurrentBuild.JobState == BuildJobState.Pending,
mode: SubscriptionMode.Repository,
cancellationToken: stoppingToken
);
while (!stoppingToken.IsCancellationRequested)
{
try
{
// Subscriptions are created before recovery so no changes are missed during the recovery window.
using ISubscription<TEngine> engineSub = await engines.SubscribeAsync(
e =>
e.CurrentBuild != null
&& e.CurrentBuild.BuildJobRunner == BuildJobRunnerType.Local
&& e.CurrentBuild.JobState == BuildJobState.Pending,
mode: SubscriptionMode.Repository,
cancellationToken: stoppingToken
);

await RecoverPendingJobsAsync(scope.ServiceProvider, stoppingToken);
await RecoverPendingJobsAsync(scope.ServiceProvider, stoppingToken);

await Task.WhenAll(
WatchEngineGroupAsync(engineSub, engineGroup, stoppingToken),
ProcessJobsAsync(engineGroup, stoppingToken)
);
// Allow either the watch or process task to complete first
using var linkedCts = CancellationTokenSource.CreateLinkedTokenSource(stoppingToken);
Task watchTask = WatchEngineGroupAsync(engineSub, engineGroup, linkedCts.Token);
Task processTask = ProcessJobsAsync(engineGroup, linkedCts.Token);
Task completedTask = await Task.WhenAny(watchTask, processTask);

// If one of the tasks has faulted, cancel the other
if (completedTask.IsFaulted)
{
await linkedCts.CancelAsync();
_logger.LogError(
completedTask.Exception,
"Exception while executing task on local build runner for {EngineGroup} engines.",
engineGroup
);
}

// Wait for both jobs to have completed (faulted or otherwise)
await Task.WhenAll(watchTask, processTask);
}
catch (OperationCanceledException)
{
break;
}
catch (Exception ex)
{
_logger.LogError(
ex,
"Exception while executing local build runner for {EngineGroup} engines.",
engineGroup
);
}
}
}

private async Task RecoverPendingJobsAsync(IServiceProvider sp, CancellationToken cancellationToken)
Expand Down
Loading