Build ErsatzTV Image / decisions.md append-only (pull_request) Successful in 6s
Build ErsatzTV Image / Docs update reminder (pull_request) Successful in 7s
Build ErsatzTV Image / API docs in sync (OpenAPI + endpoint index) (pull_request) Successful in 13s
Build ErsatzTV Image / EF migration integrity (SQLite + MySql) (pull_request) Successful in 5m20s
Build ErsatzTV Image / Build & test (.NET) (pull_request) Successful in 7m50s
Build ErsatzTV Image / Build & push image (amd64) (pull_request) Has been skipped
Build ErsatzTV Image / API docs in sync (OpenAPI + endpoint index) (push) Has been skipped
Build ErsatzTV Image / Docs update reminder (push) Has been skipped
Build ErsatzTV Image / decisions.md append-only (push) Has been skipped
Build ErsatzTV Image / EF migration integrity (SQLite + MySql) (push) Successful in 3m43s
Build ErsatzTV Image / Build & test (.NET) (push) Successful in 6m51s
Build ErsatzTV Image / Build & push image (amd64) (push) Successful in 3m26s
Independent Codex review (reconciled by Fable against a MERGEABLE fork verdict) found SaveChangesForcingVersion silently DROPPED a pending Version++ under a concurrent versioned-write race: on DbUpdateConcurrencyException it adopted the DB's current Version verbatim (original = current = dbVersion), so a bumping sibling committed at dbVersion instead of dbVersion+1. Net: an editor holding the concurrent writer's ETag was never invalidated by the sibling's change — the exact lost-update the #253/#269 contract exists to close, lost under the very condition the helper handles. F1 fix (shared helper, corrects all 25 bumpers incl. the pre-existing Add*ToPlaylist / schedule-item writers): rebase the pending delta on top of the stored token — pendingDelta = current - original; original = dbVersion; current = dbVersion + pendingDelta Bumpers (delta 1) advance to dbVersion+1; non-bumpers/deletes (delta 0, e.g. ErasePlayoutHistory) still adopt the stored token unchanged, so RootWriterForceVersionTests is unaffected. Idempotent across the bounded retry loop. F3: the force-race tests now assert Version==3 (rebase), not just membership survival; added the missing Playout force-race+rotate test. Negative-controlled: with the helper fix reverted, both strengthened tests go red. F2 (Medium, deferred → #308): two concurrent same-item Add*ToCollection can both pass the membership check and the loser 500s on the composite-PK violation (DbUpdateException, which the helper doesn't catch). Pre-existing and narrow (no corruption); doc claims softened to name it. Filed #308. Docs: api-conventions §7a + decisions.md prose corrected from "adopt the stored token" to the rebase semantics. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
98 lines
4.6 KiB
C#
98 lines
4.6 KiB
C#
using ErsatzTV.Core;
|
|
using ErsatzTV.Core.Domain;
|
|
using ErsatzTV.Core.Errors;
|
|
using Microsoft.EntityFrameworkCore;
|
|
using Microsoft.EntityFrameworkCore.ChangeTracking;
|
|
|
|
namespace ErsatzTV.Application;
|
|
|
|
public static class ConcurrencyExtensions
|
|
{
|
|
/// <summary>
|
|
/// Persist changes that touch a versioned root but do <b>not</b> participate in the If-Match
|
|
/// contract (e.g. a playout's settings/schedule-file/on-demand-checkpoint writer, a collection's
|
|
/// name edit). Because the root's <c>Version</c> is an <c>IsConcurrencyToken</c>, EF guards every
|
|
/// UPDATE of that row with <c>WHERE Version=@orig</c>, so a concurrent bump from a replace-all
|
|
/// editor would otherwise surface as an unhandled <see cref="DbUpdateConcurrencyException" /> →
|
|
/// 500 (issue #253 / #269). Phase-1 semantics for a missing <c>If-Match</c> is <b>force-write</b>,
|
|
/// so on a concurrency failure we rebase onto the stored token: original becomes the stored value
|
|
/// (the retry's WHERE then matches) and current becomes stored + our pending delta (a bumper's ++
|
|
/// still advances the ETag past the concurrent writer's value — #269 rotation; a non-bumper adopts
|
|
/// it unchanged) and retry; our own modified scalars still win. Bounded to avoid a livelock; if the row
|
|
/// was deleted out from under us, that's a genuine conflict and rethrows.
|
|
/// </summary>
|
|
public static async Task<int> SaveChangesForcingVersion(
|
|
this DbContext dbContext,
|
|
CancellationToken cancellationToken)
|
|
{
|
|
for (var attempt = 0; ; attempt++)
|
|
{
|
|
try
|
|
{
|
|
return await dbContext.SaveChangesAsync(cancellationToken);
|
|
}
|
|
catch (DbUpdateConcurrencyException ex) when (attempt < 5)
|
|
{
|
|
var resolvedAny = false;
|
|
foreach (EntityEntry entry in ex.Entries)
|
|
{
|
|
if (entry.Entity is not IVersionedAggregate)
|
|
{
|
|
continue;
|
|
}
|
|
|
|
PropertyValues databaseValues = await entry.GetDatabaseValuesAsync(cancellationToken);
|
|
if (databaseValues is null)
|
|
{
|
|
// The row was deleted out from under us — a genuine conflict, not a token race.
|
|
throw;
|
|
}
|
|
|
|
PropertyEntry version = entry.Property(nameof(IVersionedAggregate.Version));
|
|
int dbVersion = (int)databaseValues[nameof(IVersionedAggregate.Version)]!;
|
|
|
|
// Rebase our pending delta on top of the stored token instead of adopting it verbatim:
|
|
// a Version-bumping sibling (pending current = original + 1) must still advance the
|
|
// ETag PAST the concurrent writer's value, or an editor holding that writer's ETag is
|
|
// never invalidated by our change (#269 rotation silently lost under race). Non-bumpers
|
|
// (delta 0, e.g. ErasePlayoutHistory) still adopt the stored token unchanged.
|
|
int pendingDelta = (int)version.CurrentValue! - (int)version.OriginalValue!;
|
|
version.OriginalValue = dbVersion;
|
|
version.CurrentValue = dbVersion + pendingDelta;
|
|
resolvedAny = true;
|
|
}
|
|
|
|
if (!resolvedAny)
|
|
{
|
|
throw;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Persist pending changes, mapping the EF optimistic-concurrency failure to
|
|
/// <see cref="PreconditionFailedError" /> (→ 412). When a versioned root carries an
|
|
/// <c>IsConcurrencyToken</c> column and its <c>Version</c> is bumped before saving, EF emits
|
|
/// <c>UPDATE … WHERE Id=@id AND Version=@original</c>; a zero-row result (another writer won
|
|
/// the race between our load and save) throws <see cref="DbUpdateConcurrencyException" />.
|
|
/// This is the backstop that closes the load→save TOCTOU the handler pre-check cannot.
|
|
/// Issue #253.
|
|
/// </summary>
|
|
public static async Task<Either<BaseError, Unit>> SaveChangesWithConcurrencyGuard(
|
|
this DbContext dbContext,
|
|
CancellationToken cancellationToken)
|
|
{
|
|
try
|
|
{
|
|
await dbContext.SaveChangesAsync(cancellationToken);
|
|
return Unit.Default;
|
|
}
|
|
catch (DbUpdateConcurrencyException)
|
|
{
|
|
return new PreconditionFailedError(
|
|
"The resource was modified by another request. Reload and try again.");
|
|
}
|
|
}
|
|
}
|