alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-01-15 15:48:03 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Backport pull request #15698 from jellyfin/release-10.11.z

Browse Source 
Fix stack overflow during scan (#15000)

Original-merge: dde70fd8a2

Merged-by: crobibero <cody@robibe.ro>

Backported-by: Bond_009 <bond.009@outlook.com>
This commit is contained in:
myzhysz
2025-12-28 07:22:19 -05:00
committed by Bond_009
parent 1af1c72e81
commit 580585846b
1 changed files with 6 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
MediaBrowser.Controller/LibraryTaskScheduler/LimitedConcurrencyLibraryScheduler.cs
View File

@@ -243,7 +243,7 @@ public sealed class LimitedConcurrencyLibraryScheduler : ILimitedConcurrencyLibr
}; };
}).ToArray(); }).ToArray();
if (ShouldForceSequentialOperation()) if (ShouldForceSequentialOperation() || _deadlockDetector.Value is not null)
{ {
_logger.LogDebug("Process sequentially."); _logger.LogDebug("Process sequentially.");
try try
@@ -268,32 +268,11 @@ public sealed class LimitedConcurrencyLibraryScheduler : ILimitedConcurrencyLibr
await _tasks.Writer.WriteAsync(item, CancellationToken.None).ConfigureAwait(false); await _tasks.Writer.WriteAsync(item, CancellationToken.None).ConfigureAwait(false);
} }
if (_deadlockDetector.Value is not null) Worker();
{ _logger.LogDebug("Wait for {NoWorkers} to complete.", workItems.Length);
_logger.LogDebug("Nested invocation detected, process in-place."); await Task.WhenAll([.. workItems.Select(f => f.Done.Task)]).ConfigureAwait(false);
try _logger.LogDebug("{NoWorkers} completed.", workItems.Length);
{ ScheduleTaskCleanup();
// we are in a nested loop. There is no reason to spawn a task here as that would just lead to deadlocks and no additional concurrency is achieved
while (workItems.Any(e => !e.Done.Task.IsCompleted) && _tasks.TryTake(out var item, 200, _deadlockDetector.Value.Token))
{
await ProcessItem(item).ConfigureAwait(false);
}
}
catch (OperationCanceledException) when (_deadlockDetector.Value.IsCancellationRequested)
{
// operation is cancelled. Do nothing.
}
_logger.LogDebug("process in-place done.");
}
else
{
Worker();
_logger.LogDebug("Wait for {NoWorkers} to complete.", workItems.Length);
await Task.WhenAll([.. workItems.Select(f => f.Done.Task)]).ConfigureAwait(false);
_logger.LogDebug("{NoWorkers} completed.", workItems.Length);
ScheduleTaskCleanup();
}
} }
/// <inheritdoc/> /// <inheritdoc/>