The Free Software Media System - Server Backend & API
Skip backups whens can is running
Shadowghostfa07a3abe89b
diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/PeopleValidationTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/PeopleValidationTask.csindex 2a38b8c446..305f98790d 100644--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/PeopleValidationTask.cs+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/PeopleValidationTask.cs@@ -9,6 +9,7 @@ using MediaBrowser.Controller.Library;using MediaBrowser.Model.Globalization;using MediaBrowser.Model.Tasks;using Microsoft.EntityFrameworkCore;+using Microsoft.Extensions.Logging;namespace Emby.Server.Implementations.ScheduledTasks.Tasks;@@ -20,6 +21,7 @@ public class PeopleValidationTask : IScheduledTask, IConfigurableScheduledTaskprivate readonly ILibraryManager _libraryManager;private readonly ILocalizationManager _localization;private readonly IDbContextFactory<JellyfinDbContext> _dbContextFactory;+ private readonly ILogger<PeopleValidationTask> _logger;/// <summary>/// Initializes a new instance of the <see cref="PeopleValidationTask" /> class.@@ -27,11 +29,13 @@ public class PeopleValidationTask : IScheduledTask, IConfigurableScheduledTask/// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>/// <param name="localization">Instance of the <see cref="ILocalizationManager"/> interface.</param>/// <param name="dbContextFactory">Instance of the <see cref="IDbContextFactory{TContext}"/> interface.</param>- public PeopleValidationTask(ILibraryManager libraryManager, ILocalizationManager localization, IDbContextFactory<JellyfinDbContext> dbContextFactory)+ /// <param name="logger">Instance of the <see cref="ILogger{TCategoryName}"/> interface.</param>+ public PeopleValidationTask(ILibraryManager libraryManager, ILocalizationManager localization, IDbContextFactory<JellyfinDbContext> dbContextFactory, ILogger<PeopleValidationTask> logger){_libraryManager = libraryManager;_localization = localization;_dbContextFactory = dbContextFactory;+ _logger = logger;}/// <inheritdoc />@@ -75,6 +79,7 @@ public class PeopleValidationTask : IScheduledTask, IConfigurableScheduledTask// Defer it until the scan has finished; the task will run again on its next trigger.if (_libraryManager.IsScanRunning){+ _logger.LogInformation("Skipping people validation because a library scan is currently running.");return;}diff --git a/Jellyfin.Server.Implementations/FullSystemBackup/BackupService.cs b/Jellyfin.Server.Implementations/FullSystemBackup/BackupService.csindex a6dc5458ee..a534fa5fa0 100644--- a/Jellyfin.Server.Implementations/FullSystemBackup/BackupService.cs+++ b/Jellyfin.Server.Implementations/FullSystemBackup/BackupService.cs@@ -12,6 +12,7 @@ using Jellyfin.Database.Implementations;using Jellyfin.Server.Implementations.StorageHelpers;using Jellyfin.Server.Implementations.SystemBackupService;using MediaBrowser.Controller;+using MediaBrowser.Controller.Library;using MediaBrowser.Controller.SystemBackupService;using Microsoft.EntityFrameworkCore;using Microsoft.EntityFrameworkCore.Infrastructure;@@ -33,6 +34,7 @@ public class BackupService : IBackupServiceprivate readonly IServerApplicationPaths _applicationPaths;private readonly IJellyfinDatabaseProvider _jellyfinDatabaseProvider;private readonly IHostApplicationLifetime _hostApplicationLifetime;+ private readonly ILibraryManager _libraryManager;private static readonly JsonSerializerOptions _serializerSettings = new JsonSerializerOptions(JsonSerializerDefaults.General){AllowTrailingCommas = true,@@ -50,13 +52,15 @@ public class BackupService : IBackupService/// <param name="applicationPaths">The application paths.</param>/// <param name="jellyfinDatabaseProvider">The Jellyfin database Provider in use.</param>/// <param name="applicationLifetime">The SystemManager.</param>+ /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>public BackupService(ILogger<BackupService> logger,IDbContextFactory<JellyfinDbContext> dbProvider,IServerApplicationHost applicationHost,IServerApplicationPaths applicationPaths,IJellyfinDatabaseProvider jellyfinDatabaseProvider,- IHostApplicationLifetime applicationLifetime)+ IHostApplicationLifetime applicationLifetime,+ ILibraryManager libraryManager){_logger = logger;_dbProvider = dbProvider;@@ -64,6 +68,7 @@ public class BackupService : IBackupService_applicationPaths = applicationPaths;_jellyfinDatabaseProvider = jellyfinDatabaseProvider;_hostApplicationLifetime = applicationLifetime;+ _libraryManager = libraryManager;}/// <inheritdoc/>@@ -263,6 +268,14 @@ public class BackupService : IBackupService/// <inheritdoc/>public async Task<BackupManifestDto> CreateBackupAsync(BackupOptionsDto backupOptions){+ // Creating a backup runs a database optimization and reads the entire database under a transaction, both of+ // which heavily contend with an active library scan and could capture an inconsistent database state.+ if (_libraryManager.IsScanRunning)+ {+ _logger.LogWarning("Cannot create a backup while a library scan is running.");+ throw new InvalidOperationException("Cannot create a backup while a library scan is running. Please try again once the scan has finished.");+ }+var manifest = new BackupManifest(){DateCreated = DateTime.UtcNow,