Skip to content

Implement retry for ServerVersion.AutoDetect in AddMySqlDbContext for Pomelo #2386

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
merged 11 commits into from
Feb 28, 2024
Merged

Implement retry for ServerVersion.AutoDetect in AddMySqlDbContext for Pomelo #2386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3b574bb
Implement retry for ServerVersion.AutoDetect. Fixes #1866
bgrainger Feb 23, 2024
c42ce45
Use Polly for retries.
bgrainger Feb 23, 2024
5b0efbd
Switch from Microsoft.Extensions.Resilience to Polly.Extensions.
bgrainger Feb 23, 2024
a4d9ab6
Use static lambdas.
bgrainger Feb 26, 2024
896ca5e
Remove the resilience strategy from DI
eerhardt Feb 27, 2024
0cb8e32
Merge pull request #2 from eerhardt/fix-serverversion
bgrainger Feb 27, 2024
ff06e14
Merge main into fix-serverversion.
bgrainger Feb 27, 2024
60fd8a9
Use chained syntax.
bgrainger Feb 27, 2024
f10052b
Revert "Use chained syntax."
bgrainger Feb 28, 2024
b269492
Revert "Remove the resilience strategy from DI"
bgrainger Feb 28, 2024
49fbddf
Remove unnecessary variable initialization.
bgrainger Feb 28, 2024
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
1 change: 1 addition & 0 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@
<PackageVersion Include="Oracle.EntityFrameworkCore" Version="8.21.121" />
<PackageVersion Include="Polly" Version="8.3.0" />
<PackageVersion Include="Polly.Core" Version="8.3.0" />
<PackageVersion Include="Polly.Extensions" Version="8.3.0" />
<PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.0-beta.2" />
<PackageVersion Include="RabbitMQ.Client" Version="6.8.1" />
<PackageVersion Include="StackExchange.Redis" Version="2.7.17" />
Expand Down
1 change: 1 addition & 0 deletions ...ts/Aspire.Pomelo.EntityFrameworkCore.MySql/Aspire.Pomelo.EntityFrameworkCore.MySql.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" />
<PackageReference Include="MySqlConnector.Logging.Microsoft.Extensions.Logging" />
<PackageReference Include="Polly.Extensions" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" />
<PackageReference Include="OpenTelemetry.Instrumentation.EventCounters" />
Expand Down
25 changes: 24 additions & 1 deletion src/Components/Aspire.Pomelo.EntityFrameworkCore.MySql/AspireEFMySqlExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,12 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using MySqlConnector;
using MySqlConnector.Logging;
using OpenTelemetry.Metrics;
using Polly;
using Polly.Registry;
using Polly.Retry;
using Pomelo.EntityFrameworkCore.MySql.Infrastructure.Internal;

namespace Microsoft.Extensions.Hosting;
Expand Down Expand Up @@ -65,6 +69,22 @@ public static partial class AspireEFMySqlExtensions

builder.Services.AddDbContextPool<TContext>(ConfigureDbContext);

const string resilienceKey = "Microsoft.Extensions.Hosting.AspireEFMySqlExtensions.ServerVersion";
builder.Services.AddResiliencePipeline(resilienceKey, static builder =>
{
// Values are taken from MySqlRetryingExecutionStrategy.MaxRetryCount and MaxRetryDelay.
builder.AddRetry(new RetryStrategyOptions
{
ShouldHandle = static args => args.Outcome is { Exception: MySqlException { IsTransient: true } }
? PredicateResult.True()
: PredicateResult.False(),
BackoffType = DelayBackoffType.Exponential,
MaxRetryAttempts = 6,
Delay = TimeSpan.FromSeconds(1),
MaxDelay = TimeSpan.FromSeconds(30),
});
});

ConfigureInstrumentation<TContext>(builder, settings);

void ConfigureDbContext(IServiceProvider serviceProvider, DbContextOptionsBuilder dbContextOptionsBuilder)
Expand All @@ -81,7 +101,10 @@ void ConfigureDbContext(IServiceProvider serviceProvider, DbContextOptionsBuilde
if (settings.ServerVersion is null)
{
ConnectionStringValidation.ValidateConnectionString(settings.ConnectionString, connectionName, DefaultConfigSectionName, $"{DefaultConfigSectionName}:{typeof(TContext).Name}", isEfDesignTime: EF.IsDesignTime);
serverVersion = ServerVersion.AutoDetect(connectionString);

var resiliencePipelineProvider = serviceProvider.GetRequiredService<ResiliencePipelineProvider<string>>();
var resiliencePipeline = resiliencePipelineProvider.GetPipeline(resilienceKey);
serverVersion = resiliencePipeline.Execute(static cs => ServerVersion.AutoDetect(cs), connectionString);
}
else
{
Expand Down