fix(archive): lock the sequence row before its frames in every index write
FrameTiers.RecordAsync updated the frames of a sequence before its row, while a scan's sync locks the row (FOR UPDATE) before rewriting every frame. On PostgreSQL the two deadlocked and one job was aborted with 40P01. The tier writer now records the row first; the verify's integrity flags (next commit) and maintenance's duplicate flags take the row lock in the same transaction as their frames, so every writer of a sequence's frames follows one order. A PostgreSQL test that deadlocked with the old order covers it. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_012iLMBNwBE2GnphAsu4cjaC
This commit is contained in:
4 files changed
+45
-6
No files matched your search
@@ -261,8 +261,16 @@ public sealed class ArchiveMaintenance
|
|||||||
ManifestStore.WriteSequence(folder.ManifestPath, SequenceFrames.Update(manifest, changes));
|
ManifestStore.WriteSequence(folder.ManifestPath, SequenceFrames.Update(manifest, changes));
|
||||||
var setIds = bySequence.Where(x => x.Set).Select(x => x.Key).ToList();
|
var setIds = bySequence.Where(x => x.Set).Select(x => x.Key).ToList();
|
||||||
var clearIds = bySequence.Where(x => !x.Set).Select(x => x.Key).ToList();
|
var clearIds = bySequence.Where(x => !x.Set).Select(x => x.Key).ToList();
|
||||||
if (setIds.Count > 0) await _db.Frames.UpdateFlagsAsync(setIds, FrameFlags.Duplicate, FrameFlags.None, cancellationToken).ConfigureAwait(false);
|
await using (var tx = await _db.BeginAsync(cancellationToken).ConfigureAwait(false))
|
||||||
if (clearIds.Count > 0) await _db.Frames.UpdateFlagsAsync(clearIds, FrameFlags.None, FrameFlags.Duplicate, cancellationToken).ConfigureAwait(false);
|
{
|
||||||
|
// The row before its frames (SequenceRepository.GetForUpdateAsync), so a scan writing them waits or is waited for.
|
||||||
|
if (await tx.Sequences.GetForUpdateAsync(sequence.Id, cancellationToken).ConfigureAwait(false) is not null)
|
||||||
|
{
|
||||||
|
if (setIds.Count > 0) await tx.Frames.UpdateFlagsAsync(setIds, FrameFlags.Duplicate, FrameFlags.None, cancellationToken).ConfigureAwait(false);
|
||||||
|
if (clearIds.Count > 0) await tx.Frames.UpdateFlagsAsync(clearIds, FrameFlags.None, FrameFlags.Duplicate, cancellationToken).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
await tx.CommitAsync(cancellationToken).ConfigureAwait(false);
|
||||||
|
}
|
||||||
if (inStep) await _indexer.RecordStampsAsync(archive, folder, sequence.Id, cancellationToken).ConfigureAwait(false);
|
if (inStep) await _indexer.RecordStampsAsync(archive, folder, sequence.Id, cancellationToken).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -114,10 +114,12 @@ internal sealed class FrameTiers(TitanoDatabase db, SequenceWriter writer, Archi
|
|||||||
ManifestStore.WriteSequence(folder.ManifestPath, manifest);
|
ManifestStore.WriteSequence(folder.ManifestPath, manifest);
|
||||||
await using (var tx = await db.BeginAsync(cancellationToken).ConfigureAwait(false))
|
await using (var tx = await db.BeginAsync(cancellationToken).ConfigureAwait(false))
|
||||||
{
|
{
|
||||||
await tx.Frames.UpdateTiersAsync(changed.ConvertAll(f => new FrameTierFields(f.Id, f.Flags, f.PreviewW ?? 0, f.PreviewH ?? 0)), cancellationToken)
|
// The row before its frames (SequenceRepository.GetForUpdateAsync): a scan holding the row would otherwise wait
|
||||||
.ConfigureAwait(false);
|
// for these frames while this waits for the row, and PostgreSQL would abort one of them.
|
||||||
await tx.Sequences.RecordTiersAsync(sequence.Id, gained ? SequenceStatus.HasWarnings : SequenceStatus.None,
|
await tx.Sequences.RecordTiersAsync(sequence.Id, gained ? SequenceStatus.HasWarnings : SequenceStatus.None,
|
||||||
frames.Count(f => (f.Flags & FrameFlags.PreviewOnly) != 0), cancellationToken).ConfigureAwait(false);
|
frames.Count(f => (f.Flags & FrameFlags.PreviewOnly) != 0), cancellationToken).ConfigureAwait(false);
|
||||||
|
await tx.Frames.UpdateTiersAsync(changed.ConvertAll(f => new FrameTierFields(f.Id, f.Flags, f.PreviewW ?? 0, f.PreviewH ?? 0)), cancellationToken)
|
||||||
|
.ConfigureAwait(false);
|
||||||
await tx.CommitAsync(cancellationToken).ConfigureAwait(false);
|
await tx.CommitAsync(cancellationToken).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
if (inStep) await indexer.RecordStampsAsync(archive, folder, sequence.Id, cancellationToken).ConfigureAwait(false);
|
if (inStep) await indexer.RecordStampsAsync(archive, folder, sequence.Id, cancellationToken).ConfigureAwait(false);
|
||||||
|
|||||||
@@ -171,6 +171,8 @@ public sealed class SequenceRepository
|
|||||||
/// <see cref="GetAsync"/> inside a transaction, the row locked until it ends (PostgreSQL; SQLite's write lock already
|
/// <see cref="GetAsync"/> inside a transaction, the row locked until it ends (PostgreSQL; SQLite's write lock already
|
||||||
/// serialises writers): a transaction that writes the whole row back from this read cannot undo an edit that another
|
/// serialises writers): a transaction that writes the whole row back from this read cannot undo an edit that another
|
||||||
/// one commits meanwhile, as <see cref="EditAsync(Guid, SequenceEdit, int?, int?, CancellationToken)"/> takes the same lock.
|
/// one commits meanwhile, as <see cref="EditAsync(Guid, SequenceEdit, int?, int?, CancellationToken)"/> takes the same lock.
|
||||||
|
/// A transaction that writes frames of the sequence takes this lock, or writes the row, before the frames: with one
|
||||||
|
/// order no two of them wait for each other's rows (PostgreSQL would abort one with a deadlock).
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public Task<Sequence?> GetForUpdateAsync(Guid id, CancellationToken cancellationToken = default) =>
|
public Task<Sequence?> GetForUpdateAsync(Guid id, CancellationToken cancellationToken = default) =>
|
||||||
_db.SingleAsync($"{_select} WHERE s.id = $1{_db.Sql.ForUpdate}", [id], Map, cancellationToken);
|
_db.SingleAsync($"{_select} WHERE s.id = $1{_db.Sql.ForUpdate}", [id], Map, cancellationToken);
|
||||||
|
|||||||
@@ -11,8 +11,9 @@ namespace Titano.Data.Tests.Archiving;
|
|||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Writers that change part of a sequence's sidecar and index row (decode tiers, the verify, title, tags, rating and
|
/// Writers that change part of a sequence's sidecar and index row (decode tiers, the verify, title, tags, rating and
|
||||||
/// notes, a rename) while a settings edit or another writer commits, on both dialects: they write only what they own,
|
/// notes, a rename, an upload) while a settings edit, a scan or another writer commits, on both dialects: they write only
|
||||||
/// under the sequence lease, and leave what another process changed in the sidecar to the next scan.
|
/// what they own, under the sequence lease, take the row before the frames, and leave what another process changed in
|
||||||
|
/// the sidecar to the next scan or index it whole.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Category("archive")]
|
[Category("archive")]
|
||||||
public abstract class PartialRowWriterTests(TestContext context) : DatabaseTest(context)
|
public abstract class PartialRowWriterTests(TestContext context) : DatabaseTest(context)
|
||||||
@@ -76,6 +77,32 @@ public abstract class PartialRowWriterTests(TestContext context) : DatabaseTest(
|
|||||||
Assert.Equal(FrameFlags.PreviewOnly, (await fx.Db.Frames.ListBySequenceAsync(sequence.Id, cancellationToken: fx.Ct))[0].Flags);
|
Assert.Equal(FrameFlags.PreviewOnly, (await fx.Db.Frames.ListBySequenceAsync(sequence.Id, cancellationToken: fx.Ct))[0].Flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public async Task TiersRecordedWhileAScanHoldsTheRowWaitForItBeforeTheFrames()
|
||||||
|
{
|
||||||
|
var fx = await FixtureAsync();
|
||||||
|
var sequence = await IndexedAsync(fx);
|
||||||
|
var frames = await fx.Db.Frames.ListBySequenceAsync(sequence.Id, cancellationToken: fx.Ct);
|
||||||
|
|
||||||
|
// A scan's sync holds the row, as it does before it rewrites the frames, while an analysis records a tier.
|
||||||
|
Task record;
|
||||||
|
await using (var tx = await fx.Db.BeginAsync(fx.Ct))
|
||||||
|
{
|
||||||
|
await tx.Sequences.GetForUpdateAsync(sequence.Id, fx.Ct);
|
||||||
|
record = Tiers(fx).RecordAsync(fx.Archive, sequence, Preview(frames[0].Id), proxies: false, fx.Ct);
|
||||||
|
await Task.WhenAny(record, Task.Delay(500, fx.Ct));
|
||||||
|
Assert.False(record.IsCompleted, "the record waits for the row");
|
||||||
|
// The record touched no frame yet, so the scan rewrites them all without waiting for it. Had it locked its frame
|
||||||
|
// before the row, each would wait for the other and PostgreSQL would abort one of them.
|
||||||
|
await tx.Frames.SyncSequenceAsync(sequence.Id, frames, fx.Ct);
|
||||||
|
await tx.CommitAsync(fx.Ct);
|
||||||
|
}
|
||||||
|
await record;
|
||||||
|
|
||||||
|
Assert.Equal(FrameFlags.PreviewOnly, (await fx.Db.Frames.GetAsync(frames[0].Id, fx.Ct))!.Flags);
|
||||||
|
Assert.Equal(1, (await fx.Db.Sequences.GetAsync(sequence.Id, fx.Ct))!.PreviewOnlyCount);
|
||||||
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public async Task TiersRecordedAfterAnotherWriterAddedFramesLeaveThoseFramesToTheNextScan()
|
public async Task TiersRecordedAfterAnotherWriterAddedFramesLeaveThoseFramesToTheNextScan()
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in new issue
Block a user