Some checks failed
CI / lint (pull_request) Successful in 1m25s
CI / build (pull_request) Successful in 1m21s
CI / unit (pull_request) Successful in 1m30s
CI / frontend (pull_request) Successful in 3m11s
CI / mutation (pull_request) Successful in 5m59s
CI / verify-stack (pull_request) Failing after 5m50s
verify-up failed: the event-subscriber and projection-api both migrate the shared
projection DB on start, and EF releases its migrations-history lock between individual
migrations — harmless with one migration, but the new AddNotificationResource made a
second, so a migrator re-applied it in the window between the other's two migrations
("column resource already exists"). Hold a session pg_advisory_lock across the whole
MigrateAsync so the sequence runs exactly once; the second migrator then finds nothing
pending.
Verified by starting both images simultaneously against a fresh Postgres: both reach
health, the resource column is created once, and __EFMigrationsHistory has both rows.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
65 lines
2.9 KiB
C#
65 lines
2.9 KiB
C#
using EventSubscriber.Application;
|
|
using Microsoft.EntityFrameworkCore;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
|
|
namespace Projection.ReadModel;
|
|
|
|
public static class ServiceCollectionExtensions
|
|
{
|
|
/// <summary>Register the projection <see cref="ProjectionDbContext"/> against Postgres.</summary>
|
|
public static IServiceCollection AddProjectionReadModel(this IServiceCollection services, string connectionString)
|
|
=> services.AddDbContext<ProjectionDbContext>(o => o.UseNpgsql(connectionString));
|
|
|
|
/// <summary>Register the write-side ports (projector store + notification log) used by the Event Subscriber.</summary>
|
|
public static IServiceCollection AddProjectionWriteSide(this IServiceCollection services)
|
|
{
|
|
services.AddScoped<IProjectionStore, EfProjectionStore>();
|
|
services.AddScoped<INotificationLog, EfNotificationLog>();
|
|
services.AddScoped<NotificationProjector>();
|
|
return services;
|
|
}
|
|
|
|
// A fixed application-scoped key for the migration advisory lock (any stable 64-bit constant).
|
|
private const long MigrationAdvisoryLockKey = 727501;
|
|
|
|
/// <summary>Apply any pending EF migrations. Called once on service start so a fresh stack
|
|
/// reaches a usable schema without a manual migration step (DoD: compose up reaches green).
|
|
///
|
|
/// The Event Subscriber and the projection-api share this DB and both migrate on start. EF's
|
|
/// migrations-history lock is released between individual migrations, so with more than one pending
|
|
/// migration two migrators can interleave and one re-applies a migration the other just did
|
|
/// ("column already exists"). Hold a Postgres session <c>pg_advisory_lock</c> across the whole
|
|
/// sequence so it runs exactly once; the second migrator then finds nothing pending.</summary>
|
|
public static async Task MigrateProjectionAsync(this IServiceProvider services, CancellationToken ct = default)
|
|
{
|
|
await using var scope = services.CreateAsyncScope();
|
|
var db = scope.ServiceProvider.GetRequiredService<ProjectionDbContext>();
|
|
var connection = db.Database.GetDbConnection();
|
|
|
|
await connection.OpenAsync(ct);
|
|
try
|
|
{
|
|
await ExecuteAsync(connection, $"SELECT pg_advisory_lock({MigrationAdvisoryLockKey})", ct);
|
|
try
|
|
{
|
|
await db.Database.MigrateAsync(ct);
|
|
}
|
|
finally
|
|
{
|
|
await ExecuteAsync(connection, $"SELECT pg_advisory_unlock({MigrationAdvisoryLockKey})", ct);
|
|
}
|
|
}
|
|
finally
|
|
{
|
|
await connection.CloseAsync();
|
|
}
|
|
}
|
|
|
|
private static async Task ExecuteAsync(System.Data.Common.DbConnection connection, string sql, CancellationToken ct)
|
|
{
|
|
await using var command = connection.CreateCommand();
|
|
command.CommandText = sql;
|
|
await command.ExecuteNonQueryAsync(ct);
|
|
}
|
|
}
|