unkin/jellyfin-ha-src
4
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases Wiki Activity

Skip corrupt KeyframeData rows during full system backup

Browse Source 
A single row with malformed KeyframeTicks JSON (e.g. a truncated array
from an interrupted write) currently aborts the entire backup, because
the try/catch in BackupService.CreateBackupAsync only wraps
serialization of an already-materialized entity, not the enumeration
itself. EF Core throws JsonReaderException from MoveNextAsync() while
materializing the corrupt row, which propagates past that catch block.

Switch to manual enumerator iteration so MoveNextAsync() failures can
be caught per-row, logged as a warning identifying the affected table,
and skipped, allowing the remaining rows and the rest of the backup to
complete.

Fixes #17216

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
zerafachris
2026-07-17 16:44:25 +02:00
parent a96dc8bd9b
commit d7727224c2
2 changed files with 212 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jellyfin.Server.Implementations/FullSystemBackup/BackupService.cs
+34 -10
View File
@@ -359,18 +359,42 @@ public class BackupService : IBackupService
jsonSerializer.WriteStartArray();
var set = entityType.ValueFactory().ConfigureAwait(false);
await foreach (var item in set.ConfigureAwait(false))
var enumerator = set.GetAsyncEnumerator();
await using (enumerator)
{
entities++;
try
while (true)
{
using var document = JsonSerializer.SerializeToDocument(item, _serializerSettings);
document.WriteTo(jsonSerializer);
}
catch (Exception ex)
{
_logger.LogError(ex, "Could not load entity {Entity}", item);
throw;
// Reading the next row can itself throw, e.g. when a column contains malformed
// JSON (see https://github.com/jellyfin/jellyfin/issues/17216). Catch that here so a single
// corrupt row is skipped, logged for manual follow-up, and does not abort the whole backup.
bool hasNext;
try
{
hasNext = await enumerator.MoveNextAsync();
}
catch (Exception ex)
{
_logger.LogWarning(ex, "Could not read next entity of type {Table}, the underlying data appears to be corrupt. Skipping this row and continuing backup; the affected database row should be inspected and fixed manually", entityType.SourceName);
continue;
}
if (!hasNext)
{
break;
}
var item = enumerator.Current;
entities++;
try
{
using var document = JsonSerializer.SerializeToDocument(item, _serializerSettings);
document.WriteTo(jsonSerializer);
}
catch (Exception ex)
{
_logger.LogError(ex, "Could not load entity {Entity}", item);
throw;
}
}
}