Don't crash on profile migration failures

Artemis-RGB · Mar 13, 2024 · afc2256 · afc2256
1 parent da7a3e4
commit afc2256
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 20 deletions.
diff --git a/src/Artemis.Core/DryIoc/ContainerExtensions.cs b/src/Artemis.Core/DryIoc/ContainerExtensions.cs
@@ -22,8 +22,8 @@ public static class ContainerExtensions
     /// <param name="container">The builder building the current container</param>
     public static void RegisterCore(this IContainer container)
     {
-        Assembly[] coreAssembly = {typeof(IArtemisService).Assembly};
-        Assembly[] storageAssembly = {typeof(IRepository).Assembly};
+        Assembly[] coreAssembly = [typeof(IArtemisService).Assembly];
+        Assembly[] storageAssembly = [typeof(IRepository).Assembly];
 
         // Bind all services as singletons
         container.RegisterMany(coreAssembly, type => type.IsAssignableTo<IArtemisService>(), Reuse.Singleton);

diff --git a/src/Artemis.Storage/Repositories/ProfileCategoryRepository.cs b/src/Artemis.Storage/Repositories/ProfileCategoryRepository.cs
@@ -39,6 +39,12 @@ public List<ProfileCategoryEntity> GetAll()
 
     public ProfileCategoryEntity? Get(Guid id)
     {
+        if (!_migratedProfiles)
+        {
+            profileRepository.MigrateProfiles();
+            _migratedProfiles = true;
+        }
+
         using ArtemisDbContext dbContext = getContext();
         return dbContext.ProfileCategories.Include(c => c.ProfileConfigurations).FirstOrDefault(c => c.Id == id);
     }

diff --git a/src/Artemis.Storage/Repositories/ProfileRepository.cs b/src/Artemis.Storage/Repositories/ProfileRepository.cs
@@ -54,22 +54,32 @@ public void MigrateProfiles()
 
         foreach (RawProfileContainer rawProfileContainer in containers)
         {
-            JsonObject? profileConfiguration = JsonNode.Parse(rawProfileContainer.ProfileConfiguration)?.AsObject();
-            JsonObject? profile = JsonNode.Parse(rawProfileContainer.Profile)?.AsObject();
-
-            if (profileConfiguration == null || profile == null)
-                throw new ArtemisStorageException("Failed to parse profile or profile configuration");
-
-            MigrateProfile(profileConfiguration, profile);
-            rawProfileContainer.Profile = profile.ToString();
-            rawProfileContainer.ProfileConfiguration = profileConfiguration.ToString();
-
-            // Write the updated containers back to the database
-            dbContext.Database.ExecuteSqlRaw(
-                "UPDATE ProfileContainers SET Profile = {0}, ProfileConfiguration = {1} WHERE Id = {2}",
-                rawProfileContainer.Profile,
-                rawProfileContainer.ProfileConfiguration,
-                rawProfileContainer.Id);
+            try
+            {
+                JsonObject? profileConfiguration = JsonNode.Parse(rawProfileContainer.ProfileConfiguration)?.AsObject();
+                JsonObject? profile = JsonNode.Parse(rawProfileContainer.Profile)?.AsObject();
+
+                if (profileConfiguration == null || profile == null)
+                {
+                    logger.Error("Failed to parse profile or profile configuration of profile container {Id}", rawProfileContainer.Id);
+                    continue;
+                }
+
+                MigrateProfile(profileConfiguration, profile);
+                rawProfileContainer.Profile = profile.ToString();
+                rawProfileContainer.ProfileConfiguration = profileConfiguration.ToString();
+
+                // Write the updated containers back to the database
+                dbContext.Database.ExecuteSqlRaw(
+                    "UPDATE ProfileContainers SET Profile = {0}, ProfileConfiguration = {1} WHERE Id = {2}",
+                    rawProfileContainer.Profile,
+                    rawProfileContainer.ProfileConfiguration,
+                    rawProfileContainer.Id);
+            }
+            catch (Exception e)
+            {
+                logger.Error(e, "Failed to migrate profile container {Id}", rawProfileContainer.Id);
+            }
         }
     }
 
@@ -84,8 +94,8 @@ public void MigrateProfile(JsonObject? configurationJson, JsonObject? profileJso
         {
             if (profileMigrator.Version <= configurationJson["Version"]!.GetValue<int>())
                 continue;
-            
-            logger.Information("Migrating profile from version {OldVersion} to {NewVersion}", configurationJson["Version"], profileMigrator.Version);
+
+            logger.Information("Migrating profile '{Name}' from version {OldVersion} to {NewVersion}", configurationJson["Name"], configurationJson["Version"], profileMigrator.Version);
 
             profileMigrator.Migrate(configurationJson, profileJson);
             configurationJson["Version"] = profileMigrator.Version;

diff --git a/src/Artemis.Storage/StorageManager.cs b/src/Artemis.Storage/StorageManager.cs
@@ -49,6 +49,7 @@ public static ArtemisDbContext CreateDbContext(string dataFolder)
             return dbContext;
 
         dbContext.Database.Migrate();
+        dbContext.Database.ExecuteSqlRaw("PRAGMA optimize");
         _ranMigrations = true;
 
         return dbContext;