TheSunIsLeaking/DorkNet
3
0
Fork 0
mirror of https://github.com/DorkSquadRR/DorkNet.git synced 2026-10-25 23:18:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix: wait for the bootstrap lock without a command timeout; safe unlock

Browse Source 
From the local CodeRabbit review:
- A replica waiting for the lock used the default 30 s command timeout and
  failed to boot while another replica seeded a fresh database. Wait with
  no timeout, logging that it is waiting.
- An unlock failure in the finally (e.g. the connection already broken)
  replaced the real bootstrap error and skipped closing the connection.
  Log it instead, and always close.
This commit is contained in:
Alexa
2026-10-25 13:52:20 +02:00
parent bb22675a91
commit d0d26c9821
1 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DorkNet.Server/Startup/DatabaseBootstrap.cs
+31 -5
View File
@@ -87,8 +87,21 @@ public static class DatabaseBootstrap
// The connection stays open until the finally, so every step below
// (they all share this scope's DbContext) runs on the session that
// holds the lock.
await db.Database.ExecuteSqlRawAsync("SELECT pg_advisory_lock(1146246987);");
// holds the lock. Waiting for it has no command timeout: another
// replica may be seeding a fresh database (thumbnail downloads
// included) for well over the default 30 s.
connectLogger.LogInformation("[bootstrap] waiting for the database bootstrap lock");
var previousTimeout = db.Database.GetCommandTimeout();
db.Database.SetCommandTimeout(0);
try
{
await db.Database.ExecuteSqlRawAsync("SELECT pg_advisory_lock(1146246987);");
}
finally
{
db.Database.SetCommandTimeout(previousTimeout);
}
connectLogger.LogInformation("[bootstrap] holding the database bootstrap lock");
try
{
// Begin the transaction through EF, not on the raw connection:
@@ -106,9 +119,22 @@ public static class DatabaseBootstrap
finally
{
// Explicit: Npgsql pools connections, so closing alone would not
// end the session that holds the lock.
await db.Database.ExecuteSqlRawAsync("SELECT pg_advisory_unlock(1146246987);");
await conn.CloseAsync();
// end the session that holds the lock. If the connection is
// already broken the unlock fails too; that must not replace the
// real bootstrap error, and the connection still gets closed
// (Postgres then drops the lock with the session).
try
{
await db.Database.ExecuteSqlRawAsync("SELECT pg_advisory_unlock(1146246987);");
}
catch (Exception ex)
{
connectLogger.LogWarning(ex, "[bootstrap] releasing the database bootstrap lock failed");
}
finally
{
await conn.CloseAsync();
}
}
}