Skip to content
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.

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

fix: keep trying to acquire lock in cache invalidator #1274

Merged
merged 1 commit into from
Sep 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
37 changes: 22 additions & 15 deletions src/BuildingRegistry.Cache.Invalidator/Infrastructure/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,19 @@ namespace BuildingRegistry.Cache.Invalidator.Infrastructure
using System;
using System.IO;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using System.Timers;
using Autofac;
using Autofac.Extensions.DependencyInjection;
using Be.Vlaanderen.Basisregisters.Aws.DistributedMutex;
using BuildingRegistry.Infrastructure;
using Consumer.Read.Parcel;
using Consumer.Read.Parcel.Infrastructure.Modules;
using Destructurama;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Polly;
using Serilog;
using Serilog.Debugging;
using Serilog.Extensions.Logging;
Expand Down Expand Up @@ -65,9 +64,7 @@ public static async Task Main(string[] args)
builder.ClearProviders();
builder.AddSerilog(Log.Logger);
})
.ConfigureServices((hostContext, services) =>
{
})
.ConfigureServices((hostContext, services) => { })
.UseServiceProviderFactory(new AutofacServiceProviderFactory())
.ConfigureContainer<ContainerBuilder>((hostContext, builder) =>
{
Expand Down Expand Up @@ -103,17 +100,27 @@ public static async Task Main(string[] args)
if (consumerParcelContext.BuildingsToInvalidate.Any())
{
var distributedLockTableName = configuration.GetValue<string>("DistributedLock:LockName")
?? throw new Exception("No 'LockName' configuration found");
?? throw new Exception("No 'LockName' configuration found");

var distributedLockOptions = DistributedLockOptions.LoadFromConfiguration(configuration);
var distributedLock = new DistributedLock<Program>(distributedLockOptions, distributedLockTableName, loggerFactory.CreateLogger<Program>());

await distributedLock.RunAsync(
async () =>
{
await host.RunAsync().ConfigureAwait(false);
})
.ConfigureAwait(false);
var distributedLock = new DistributedLock<Program>(
distributedLockOptions,
distributedLockTableName,
loggerFactory.CreateLogger<Program>());

await Policy
.Handle<AcquireLockFailedException>()
.WaitAndRetryAsync(5, _ =>
{
Log.Information("Failed to acquire lock. Trying again within 1 minute.");
return TimeSpan.FromMinutes(1);
})
.ExecuteAsync(async ct =>
{
await distributedLock.RunAsync(
async () => { await host.RunAsync(token: ct).ConfigureAwait(false); })
.ConfigureAwait(false);
}, CancellationToken.None);
}
}
catch (AggregateException aggregateException)
Expand Down
3 changes: 2 additions & 1 deletion src/BuildingRegistry.Cache.Invalidator/appsettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
"Region": "eu-west-1",
"TableName": "__DistributedLocks__",
"LeasePeriodInMinutes": 5,
"ThrowOnFailedAcquire": true,
"TerminateApplicationOnFailedRenew": true,
"TerminateApplicationOnFailedAcquire": true,
"TerminateApplicationOnFailedAcquire": false,
"LockName": "Be.Vlaanderen.Basisregisters.Redis.Populator.Program"
},

Expand Down
Loading