diff options
Diffstat (limited to 'MediaBrowser.Server.Implementations/Persistence')
| -rw-r--r-- | MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs | 11 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs | 6 |
2 files changed, 2 insertions, 15 deletions
diff --git a/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs b/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs index 5c600c249..0959e2123 100644 --- a/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs +++ b/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs @@ -67,7 +67,8 @@ namespace MediaBrowser.Server.Implementations.Persistence { OnProgress(0); - // Ensure these objects are out of the database. + // Ensure these objects are lazy loaded. + // Without this there is a deadlock that will need to be investigated var rootChildren = _libraryManager.RootFolder.Children.ToList(); rootChildren = _libraryManager.GetUserRootFolder().Children.ToList(); @@ -182,14 +183,6 @@ namespace MediaBrowser.Server.Implementations.Persistence progress.Report(100); } - private void LogMessage(string msg) - { - if (EnableUnavailableMessage) - { - _logger.Info(msg); - } - } - private async Task CleanDeadItems(CancellationToken cancellationToken, IProgress<double> progress) { var itemIds = _libraryManager.GetItemIds(new InternalItemsQuery diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs index 3dc37110e..7898dc1ef 100644 --- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs +++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs @@ -583,22 +583,16 @@ namespace MediaBrowser.Server.Implementations.Persistence CheckDisposed(); - _logger.Info("SaveItems waiting on write lock"); - await _writeLock.WaitAsync(cancellationToken).ConfigureAwait(false); IDbTransaction transaction = null; try { - _logger.Info("SaveItems creating transaction"); - transaction = _connection.BeginTransaction(); foreach (var item in items) { - _logger.Info("Saving {0}", item.Id); - cancellationToken.ThrowIfCancellationRequested(); var index = 0; |
