Cache ServerVersion.AutoDetect (#4256)

* Cache ServerVersion.AutoDetect Adjusted database connections so that they cache ServerVersion.AutoDetect result on first hit and reuse. This resolves a current bug that exhausts or times out connections to database. * Change to dictionary * Update Source/ACE.Database/DatabaseManager.cs Co-authored-by: gmriggs <gmriggs@gmail.com> * Update DatabaseManager.cs * Update DatabaseManager.cs --------- Co-authored-by: gmriggs <gmriggs@gmail.com>
ACEmulator · Dec 18, 2024 · 74cce13 · 74cce13
1 parent 7eee40e
commit 74cce13
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/Source/ACE.Database/DatabaseManager.cs b/Source/ACE.Database/DatabaseManager.cs
@@ -1,4 +1,7 @@
 using System;
+using System.Collections.Concurrent;
+
+using Microsoft.EntityFrameworkCore;
 
 using log4net;
 
@@ -69,5 +72,17 @@ public static void Stop()
             if (serializedShardDb != null)
                 serializedShardDb.Stop();
         }
+
+        private static readonly ConcurrentDictionary<string, ServerVersion> cachedServerVersions = new();
+
+        public static ServerVersion CachedServerVersionAutoDetect(string database, string connectionString)
+        {
+            if (!cachedServerVersions.TryGetValue(database, out ServerVersion serverVersion))
+            {
+                serverVersion = ServerVersion.AutoDetect(connectionString);
+                cachedServerVersions[database] = serverVersion;
+            }
+            return serverVersion;
+        }
     }
 }
diff --git a/Source/ACE.Database/Models/Auth/AuthDbContext.cs b/Source/ACE.Database/Models/Auth/AuthDbContext.cs
@@ -28,7 +28,7 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
 
             var connectionString = $"server={config.Host};port={config.Port};user={config.Username};password={config.Password};database={config.Database};{config.ConnectionOptions}";
 
-            optionsBuilder.UseMySql(connectionString, ServerVersion.AutoDetect(connectionString), builder =>
+            optionsBuilder.UseMySql(connectionString, DatabaseManager.CachedServerVersionAutoDetect(config.Database, connectionString), builder =>
             {
                 builder.EnableRetryOnFailure(10);
             });

diff --git a/Source/ACE.Database/Models/Shard/ShardDbContext.cs b/Source/ACE.Database/Models/Shard/ShardDbContext.cs
@@ -104,7 +104,7 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
 
             var connectionString = $"server={config.Host};port={config.Port};user={config.Username};password={config.Password};database={config.Database};{config.ConnectionOptions}";
 
-            optionsBuilder.UseMySql(connectionString, ServerVersion.AutoDetect(connectionString), builder =>
+            optionsBuilder.UseMySql(connectionString, DatabaseManager.CachedServerVersionAutoDetect(config.Database, connectionString), builder =>
             {
                 builder.EnableRetryOnFailure(10);
             });

diff --git a/Source/ACE.Database/Models/World/WorldDbContext.cs b/Source/ACE.Database/Models/World/WorldDbContext.cs
@@ -132,7 +132,7 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
 
             var connectionString = $"server={config.Host};port={config.Port};user={config.Username};password={config.Password};database={config.Database};{config.ConnectionOptions}";
 
-            optionsBuilder.UseMySql(connectionString, ServerVersion.AutoDetect(connectionString), builder =>
+            optionsBuilder.UseMySql(connectionString, DatabaseManager.CachedServerVersionAutoDetect(config.Database, connectionString), builder =>
             {
                 builder.EnableRetryOnFailure(10);
             });