diff --git a/backend/FwHeadless/FwHeadlessKernel.cs b/backend/FwHeadless/FwHeadlessKernel.cs index e96157c7da..b4edf107e6 100644 --- a/backend/FwHeadless/FwHeadlessKernel.cs +++ b/backend/FwHeadless/FwHeadlessKernel.cs @@ -5,6 +5,7 @@ using FwLiteProjectSync; using LcmCrdt; using Microsoft.Extensions.DependencyInjection.Extensions; +using Microsoft.Extensions.Http.Resilience; using Microsoft.Extensions.Options; using MiniLcm.Project; using MiniLcmWeb; @@ -14,6 +15,7 @@ namespace FwHeadless; public static class FwHeadlessKernel { public const string LexboxHttpClientName = "LexboxHttpClient"; + public const string LexboxSyncHttpClientName = "LexboxSyncHttpClient"; public static IServiceCollection AddFwHeadless(this IServiceCollection services) { services @@ -51,11 +53,35 @@ public static IServiceCollection AddFwHeadless(this IServiceCollection services) services.AddScoped(); services.AddScoped(); services.AddTransient(); - services.AddHttpClient(LexboxHttpClientName, + services.AddLexboxHttpClient(LexboxHttpClientName); + // Lexbox stores a push in one transaction, so a project's whole unpushed history must fit in one attempt. + services.AddLexboxHttpClient(LexboxSyncHttpClientName, options => + { + options.AttemptTimeout.Timeout = TimeSpan.FromSeconds(30); + options.TotalRequestTimeout.Timeout = TimeSpan.FromSeconds(90); + // must be at least twice the attempt timeout + options.CircuitBreaker.SamplingDuration = TimeSpan.FromSeconds(60); + }); + return services; + } + + private static IHttpClientBuilder AddLexboxHttpClient(this IServiceCollection services, string name, + Action? configureResilience = null) + { + var builder = services.AddHttpClient(name, (provider, client) => { client.BaseAddress = new Uri(provider.GetRequiredService>().Value.LexboxUrl); - }).AddHttpMessageHandler(); - return services; + }); + if (configureResilience is not null) + { +#pragma warning disable EXTEXP0001 + builder.RemoveAllResilienceHandlers() +#pragma warning restore EXTEXP0001 + .AddStandardResilienceHandler(configureResilience); + } + // Auth goes after the resilience handler (the default one is added first), so every retry re-runs auth. + builder.AddHttpMessageHandler(); + return builder; } } diff --git a/backend/FwHeadless/Services/CrdtSyncService.cs b/backend/FwHeadless/Services/CrdtSyncService.cs index 7fbaf3d87f..2223f63d0e 100644 --- a/backend/FwHeadless/Services/CrdtSyncService.cs +++ b/backend/FwHeadless/Services/CrdtSyncService.cs @@ -17,7 +17,7 @@ public virtual async Task SyncHarmonyProject() activity?.SetTag("app.project_id", currentProjectService.ProjectData.Id); var lexboxRemoteServer = await httpSyncService.CreateProjectSyncable( currentProjectService.ProjectData, - httpClientFactory.CreateClient(FwHeadlessKernel.LexboxHttpClientName) + httpClientFactory.CreateClient(FwHeadlessKernel.LexboxSyncHttpClientName) ); var syncResults = await dataModel.SyncWith(lexboxRemoteServer); if (!syncResults.IsSynced) throw new InvalidOperationException("Sync failed"); diff --git a/backend/LexBoxApi/Services/CrdtCommitService.cs b/backend/LexBoxApi/Services/CrdtCommitService.cs index a7f287be06..fd0fd33af3 100644 --- a/backend/LexBoxApi/Services/CrdtCommitService.cs +++ b/backend/LexBoxApi/Services/CrdtCommitService.cs @@ -21,7 +21,8 @@ public async Task AddCommits(Guid projectId, IAsyncEnumerable //A projection lambda here would let linq2db v6 wrap our Sql.Expr<...>::jsonb cast in the //EF value-converter (JsonSerializer.Serialize) and fail SQL translation. var stampedCommits = commits.Select(c => { c.ProjectId = projectId; return c; }); - await tmpTable.BulkCopyAsync(new BulkCopyOptions{BulkCopyType = BulkCopyType.ProviderSpecific, MaxBatchSize = 10}, stampedCommits, token); + //rows stream into COPY either way; a small MaxBatchSize only adds a server round trip per batch + await tmpTable.BulkCopyAsync(new BulkCopyOptions{BulkCopyType = BulkCopyType.ProviderSpecific}, stampedCommits, token); var commitsTable = linqToDbContext.GetTable(); var inserted = await commitsTable diff --git a/backend/Testing/FwHeadless/LexboxHttpClientTests.cs b/backend/Testing/FwHeadless/LexboxHttpClientTests.cs new file mode 100644 index 0000000000..9aaa5d9384 --- /dev/null +++ b/backend/Testing/FwHeadless/LexboxHttpClientTests.cs @@ -0,0 +1,39 @@ +using FwHeadless; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.Http.Resilience; +using WebServiceDefaults; + +namespace Testing.FwHeadless; + +public class LexboxHttpClientTests +{ + private static ServiceProvider BuildServices() + { + var builder = Host.CreateApplicationBuilder(); + builder.AddServiceDefaults("test"); + builder.Services.AddFwHeadless(); + return builder.Services.BuildServiceProvider(); + } + + private static List HandlerChain(ServiceProvider services, string clientName) + { + var handler = services.GetRequiredService().CreateHandler(clientName); + var chain = new List(); + while (handler is DelegatingHandler delegating) + { + if (delegating is ResilienceHandler or HttpClientAuthHandler) chain.Add(delegating.GetType()); + handler = delegating.InnerHandler!; + } + return chain; + } + + [Theory] + [InlineData(FwHeadlessKernel.LexboxHttpClientName)] + [InlineData(FwHeadlessKernel.LexboxSyncHttpClientName)] + public void EachRetryRunsAuth(string clientName) + { + using var services = BuildServices(); + HandlerChain(services, clientName).Should().Equal(typeof(ResilienceHandler), typeof(HttpClientAuthHandler)); + } +}