The Free Software Media System - Server Backend & API
Locking cleaning (#15713)
Mark Cilia Vincentic3a8734adf00
diff --git a/Directory.Packages.props b/Directory.Packages.propsindex 210cbd35d6..1d18a705cb 100644--- a/Directory.Packages.props+++ b/Directory.Packages.props@@ -4,7 +4,7 @@</PropertyGroup><!-- Run "dotnet list package (dash,dash)outdated" to see the latest versions of each package.--><ItemGroup Label="Package Dependencies">- <PackageVersion Include="AsyncKeyedLock" Version="7.1.7" />+ <PackageVersion Include="AsyncKeyedLock" Version="7.1.8" /><PackageVersion Include="AutoFixture.AutoMoq" Version="4.18.1" /><PackageVersion Include="AutoFixture.Xunit2" Version="4.18.1" /><PackageVersion Include="AutoFixture" Version="4.18.1" />diff --git a/Jellyfin.Server/Filters/CachingOpenApiProvider.cs b/Jellyfin.Server/Filters/CachingOpenApiProvider.csindex 4169f2fb31..b560ec50ef 100644--- a/Jellyfin.Server/Filters/CachingOpenApiProvider.cs+++ b/Jellyfin.Server/Filters/CachingOpenApiProvider.cs@@ -1,5 +1,5 @@using System;-using System.Threading;+using AsyncKeyedLock;using Microsoft.AspNetCore.Mvc.ApiExplorer;using Microsoft.Extensions.Caching.Memory;using Microsoft.Extensions.Options;@@ -17,7 +17,7 @@ internal sealed class CachingOpenApiProvider : ISwaggerProviderprivate const string CacheKey = "openapi.json";private static readonly MemoryCacheEntryOptions _cacheOptions = new() { SlidingExpiration = TimeSpan.FromMinutes(5) };- private static readonly SemaphoreSlim _lock = new(1, 1);+ private static readonly AsyncNonKeyedLocker _lock = new(1);private static readonly TimeSpan _lockTimeout = TimeSpan.FromSeconds(1);private readonly IMemoryCache _memoryCache;@@ -50,30 +50,20 @@ internal sealed class CachingOpenApiProvider : ISwaggerProviderreturn AdjustDocument(openApiDocument, host, basePath);}- var acquired = _lock.Wait(_lockTimeout);- try+ using var acquired = _lock.LockOrNull(_lockTimeout);+ if (_memoryCache.TryGetValue(CacheKey, out openApiDocument) && openApiDocument is not null){- if (_memoryCache.TryGetValue(CacheKey, out openApiDocument) && openApiDocument is not null)- {- return AdjustDocument(openApiDocument, host, basePath);- }-- if (!acquired)- {- throw new InvalidOperationException("OpenApi document is generating");- }-- openApiDocument = _swaggerGenerator.GetSwagger(documentName);- _memoryCache.Set(CacheKey, openApiDocument, _cacheOptions);return AdjustDocument(openApiDocument, host, basePath);}- finally++ if (acquired is null){- if (acquired)- {- _lock.Release();- }+ throw new InvalidOperationException("OpenApi document is generating");}++ openApiDocument = _swaggerGenerator.GetSwagger(documentName);+ _memoryCache.Set(CacheKey, openApiDocument, _cacheOptions);+ return AdjustDocument(openApiDocument, host, basePath);}private OpenApiDocument AdjustDocument(OpenApiDocument document, string? host, string? basePath)diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csprojindex 9af13b0a72..5f15f845c5 100644--- a/MediaBrowser.Common/MediaBrowser.Common.csproj+++ b/MediaBrowser.Common/MediaBrowser.Common.csproj@@ -1,4 +1,4 @@-<Project Sdk="Microsoft.NET.Sdk">+<Project Sdk="Microsoft.NET.Sdk"><!-- ProjectGuid is only included as a requirement for SonarQube analysis --><PropertyGroup>