aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVasily <just.one.man@yandex.ru>2020-03-05 17:41:32 +0300
committerVasily <just.one.man@yandex.ru>2020-03-05 17:41:32 +0300
commit9eef0e8ca0e3359239ab68fcadbf2d65084f12e6 (patch)
tree11e2d805fa397a409e00905a45cbd2a538386858
parentacd67c7152cc9a476d5cc9e7a4b95b084bfaeb6e (diff)
Implement EnableThrottling migration for pre-10.5.0 to 10.5.0 or newer
-rw-r--r--Jellyfin.Server/CoreAppHost.cs38
-rw-r--r--Jellyfin.Server/Migrations.cs92
-rw-r--r--Jellyfin.Server/Program.cs1
3 files changed, 121 insertions, 10 deletions
diff --git a/Jellyfin.Server/CoreAppHost.cs b/Jellyfin.Server/CoreAppHost.cs
index 59285a510..cd5a2ce85 100644
--- a/Jellyfin.Server/CoreAppHost.cs
+++ b/Jellyfin.Server/CoreAppHost.cs
@@ -41,16 +41,6 @@ namespace Jellyfin.Server
networkManager,
configuration)
{
- var previousVersion = ConfigurationManager.CommonConfiguration.PreviousVersion;
- if (ApplicationVersion.CompareTo(previousVersion) > 0)
- {
- Logger.LogWarning("Version check shows Jellyfin was updated: previous version={0}, current version={1}", previousVersion, ApplicationVersion);
-
- // TODO: run update routines
-
- ConfigurationManager.CommonConfiguration.PreviousVersion = ApplicationVersion;
- ConfigurationManager.SaveConfiguration();
- }
}
/// <inheritdoc />
@@ -67,5 +57,33 @@ namespace Jellyfin.Server
/// <inheritdoc />
protected override void ShutdownInternal() => Program.Shutdown();
+
+ /// <summary>
+ /// Runs the migration routines if necessary.
+ /// </summary>
+ public void TryMigrate()
+ {
+ var previousVersion = ConfigurationManager.CommonConfiguration.PreviousVersion;
+ switch (ApplicationVersion.CompareTo(previousVersion))
+ {
+ case 1:
+ Logger.LogWarning("Version check shows Jellyfin was updated: previous version={0}, current version={1}", previousVersion, ApplicationVersion);
+
+ Migrations.Run(this, Logger);
+
+ ConfigurationManager.CommonConfiguration.PreviousVersion = ApplicationVersion;
+ ConfigurationManager.SaveConfiguration();
+ break;
+ case 0:
+ // nothing to do, versions match
+ break;
+ case -1:
+ Logger.LogWarning("Version check shows Jellyfin was rolled back, use at your own risk: previous version={0}, current version={1}", previousVersion, ApplicationVersion);
+ // no "rollback" routines for now
+ ConfigurationManager.CommonConfiguration.PreviousVersion = ApplicationVersion;
+ ConfigurationManager.SaveConfiguration();
+ break;
+ }
+ }
}
}
diff --git a/Jellyfin.Server/Migrations.cs b/Jellyfin.Server/Migrations.cs
new file mode 100644
index 000000000..95fea4ea5
--- /dev/null
+++ b/Jellyfin.Server/Migrations.cs
@@ -0,0 +1,92 @@
+using System;
+using System.Collections.Generic;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Model.Configuration;
+using Microsoft.Extensions.Logging;
+
+namespace Jellyfin.Server
+{
+ /// <summary>
+ /// The class that knows how migrate between different Jellyfin versions.
+ /// </summary>
+ internal static class Migrations
+ {
+ private static readonly IUpdater[] _migrations =
+ {
+ new Pre10_5()
+ };
+
+ /// <summary>
+ /// Interface that descibes a migration routine.
+ /// </summary>
+ private interface IUpdater
+ {
+ /// <summary>
+ /// Gets maximum version this Updater applies to.
+ /// If current version is greater or equal to it, skip the updater.
+ /// </summary>
+ public abstract Version Maximum { get; }
+
+ /// <summary>
+ /// Execute the migration from version "from".
+ /// </summary>
+ /// <param name="host">Host that hosts current version.</param>
+ /// <param name="logger">Host logger.</param>
+ /// <param name="from">Version to migrate from.</param>
+ /// <returns>Whether configuration was changed.</returns>
+ public abstract bool Perform(CoreAppHost host, ILogger logger, Version from);
+ }
+
+ /// <summary>
+ /// Run all needed migrations.
+ /// </summary>
+ /// <param name="host">CoreAppHost that hosts current version.</param>
+ /// <param name="logger">AppHost logger.</param>
+ /// <returns>Whether anything was changed.</returns>
+ public static bool Run(CoreAppHost host, ILogger logger)
+ {
+ bool updated = false;
+ var version = host.ServerConfigurationManager.CommonConfiguration.PreviousVersion;
+
+ for (var i = 0; i < _migrations.Length; i++)
+ {
+ var updater = _migrations[i];
+ if (version.CompareTo(updater.Maximum) >= 0)
+ {
+ logger.LogDebug("Skipping updater {0} as current version {1} >= its maximum applicable version {2}", updater, version, updater.Maximum);
+ continue;
+ }
+
+ if (updater.Perform(host, logger, version))
+ {
+ updated = true;
+ }
+
+ version = updater.Maximum;
+ }
+
+ return updated;
+ }
+
+ private class Pre10_5 : IUpdater
+ {
+ public Version Maximum { get => Version.Parse("10.5.0"); }
+
+ public bool Perform(CoreAppHost host, ILogger logger, Version from)
+ {
+ // Set EnableThrottling to false as it wasn't used before, and in 10.5.0 it may introduce issues
+ var encoding = ((IConfigurationManager)host.ServerConfigurationManager).GetConfiguration<EncodingOptions>("encoding");
+ if (encoding.EnableThrottling)
+ {
+ logger.LogInformation("Disabling transcoding throttling during migration");
+ encoding.EnableThrottling = false;
+
+ host.ServerConfigurationManager.SaveConfiguration("encoding", encoding);
+ return true;
+ }
+
+ return false;
+ }
+ }
+ }
+}
diff --git a/Jellyfin.Server/Program.cs b/Jellyfin.Server/Program.cs
index 484e507a2..aa1bdb169 100644
--- a/Jellyfin.Server/Program.cs
+++ b/Jellyfin.Server/Program.cs
@@ -182,6 +182,7 @@ namespace Jellyfin.Server
// A bit hacky to re-use service provider since ASP.NET doesn't allow a custom service collection.
appHost.ServiceProvider = host.Services;
appHost.FindParts();
+ appHost.TryMigrate();
try
{