allow rating systems restart without restarting server

Author: DeinFreund

Zero-K.info/Controllers/AdminController.cs

@@ -1,4 +1,5 @@
 
+using Ratings;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -32,6 +33,14 @@ public ActionResult ResetDb()
             else return Content("Not allowed!");
         }
 
+        [Auth(Role = AdminLevel.Moderator)]
+        public ActionResult ResetRatings()
+        {
+            RatingSystems.ReinitializeRatingSystems();
+            return Content("Recalculation in progress, check the trace log for details. This operation will take 5 to 10 minutes.");
+        }
+
+
         [Auth(Role = AdminLevel.Moderator)]
         public ActionResult TraceLogs(TraceLogIndex model)
         {

Zero-K.info/Views/Shared/UserDetail.cshtml

@@ -398,6 +398,7 @@
             {
                 <a href="@Url.Action("ResetDB", "Admin")" class="js_confirm">Reset database (copy from live)</a><br />
             }
+            <a href="@Url.Action("ResetRatings", "Admin")" class="js_confirm">Recalculate all ratings</a><br />
             <a href="@Url.Action("Index", "Engines")">Engines</a><br />
             <a href="@Url.Action("ChatHistory", "Lobby")">Lobby chat history</a><br />
             <a href="@Url.Action("TraceLogs", "Admin")">Infrastructure trace logs</a><br />

ZkData/Ef/WHR/RatingSystems.cs

@@ -5,27 +5,78 @@
 using System.Threading.Tasks;
 using ZkData;
 using System.Data.Entity;
+using System.Threading;
 
 namespace Ratings
 {
     public class RatingSystems
     {
-        public static Dictionary<RatingCategory, WholeHistoryRating> whr = new Dictionary<RatingCategory, WholeHistoryRating>();
-
         public static readonly IEnumerable<RatingCategory> ratingCategories = Enum.GetValues(typeof(RatingCategory)).Cast<RatingCategory>();
 
-        private static HashSet<int> processedBattles = new HashSet<int>();
-
-        public static bool Initialized { get; private set; }
+        private static RatingSystems handler;
 
-        private static object processingLock = new object();
 
         public static void Init()
         {
-            Initialized = false;
-            ratingCategories.ForEach(category => whr[category] = new WholeHistoryRating(category));
+            handler = new RatingSystems(false);
+        }
 
+        public static void ReinitializeRatingSystems()
+        {
+            Trace.TraceInformation("Reinitializing rating systems...");
             Task.Factory.StartNew(() => {
+                handler = new RatingSystems(true);
+                Trace.TraceInformation("Ratings have been recalculated!");
+            });
+        }
+
+        public static IEnumerable<IRatingSystem> GetRatingSystems()
+        {
+            return handler.whr.Values;
+        }
+
+        public static IRatingSystem GetRatingSystem(RatingCategory category)
+        {
+            if (handler == null) return null;
+            return handler.GetRatingSystemInternal(category);
+        }
+        
+
+        public static void ProcessResult(SpringBattle battle)
+        {
+            if (!handler.Initialized) return;
+            handler.ProcessBattle(battle);
+        }
+        
+        public static Tuple<int, int> GetPlanetwarsFactionStats(int factionID)
+        {
+            return handler.GetPlanetwarsFactionStatsInternal(factionID);
+        }
+
+        public static int ConvertDateToDays(DateTime date)
+        {
+            return (int)(date.ToUniversalTime().Subtract(new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc)).TotalDays / 1);
+        }
+        public static DateTime ConvertDaysToDate(int days)
+        {
+            return new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc).AddDays(days);
+        }
+
+
+        private Dictionary<RatingCategory, WholeHistoryRating> whr = new Dictionary<RatingCategory, WholeHistoryRating>();
+
+        private HashSet<int> processedBattles = new HashSet<int>();
+
+        private object processingLock = new object();
+        
+        public bool Initialized { get; private set; } = false;
+
+        private RatingSystems(bool waitForCompleteInitialization)
+        {
+            ratingCategories.ForEach(category => whr[category] = new WholeHistoryRating(category, this));
+
+            Action initBattles = () =>
+            {
                 lock (processingLock)
                 {
                     try
@@ -48,24 +99,30 @@ public static void Init()
                                 }
                             }
                             Initialized = true;
-                            whr.Values.ForEach(w => w.UpdateRatings());
+                            if (waitForCompleteInitialization)
+                            {
+                                SemaphoreSlim completedUpdates = new SemaphoreSlim(0);
+                                whr.Values.ForEach(w => w.UpdateRatings(() => completedUpdates.Release()));
+                                whr.Values.ForEach(w => completedUpdates.Wait());
+                            }
+                            else
+                            {
+                                whr.Values.ForEach(w => w.UpdateRatings());
+                            }
                         }
                     }
                     catch (Exception ex)
                     {
                         Trace.TraceError("WHR: Error reading battles from DB" + ex);
                     }
                 }
-            });
-        }
-
-
-        public static IEnumerable<IRatingSystem> GetRatingSystems()
-        {
-            return whr.Values;
+            };
+            if (waitForCompleteInitialization) initBattles.Invoke();
+            else Task.Factory.StartNew(initBattles);
         }
+        
 
-        public static IRatingSystem GetRatingSystem(RatingCategory category)
+        private IRatingSystem GetRatingSystemInternal(RatingCategory category)
         {
             if (!whr.ContainsKey(category))
             {
@@ -75,15 +132,9 @@ public static IRatingSystem GetRatingSystem(RatingCategory category)
             return whr[category];
         }
 
-        private static int latestBattle;
+        private int latestBattle;
 
-        public static void ProcessResult(SpringBattle battle)
-        {
-            if (!Initialized) return;
-            ProcessBattle(battle);
-        }
-
-        private static void ProcessBattle(SpringBattle battle)
+        private void ProcessBattle(SpringBattle battle)
         {
             lock (processingLock)
             {
@@ -103,9 +154,9 @@ private static void ProcessBattle(SpringBattle battle)
             }
         }
 
-        private static Dictionary<int, Tuple<int, int, int>> factionCache = new Dictionary<int, Tuple<int, int, int>>();
+        private Dictionary<int, Tuple<int, int, int>> factionCache = new Dictionary<int, Tuple<int, int, int>>();
 
-        public static Tuple<int, int> GetPlanetwarsFactionStats(int factionID)
+        private Tuple<int, int> GetPlanetwarsFactionStatsInternal(int factionID)
         {
             try
             {
@@ -131,23 +182,15 @@ public static Tuple<int, int> GetPlanetwarsFactionStats(int factionID)
                 count = factionCache[factionID].Item2;
                 skill = factionCache[factionID].Item3;
                 return new Tuple<int, int>(count, skill);
-            }catch(Exception ex)
+            }
+            catch (Exception ex)
             {
                 Trace.TraceError("WHR failed to calculate faction stats " + ex);
                 return new Tuple<int, int>(-1, -1);
             }
         }
 
-        public static int ConvertDateToDays(DateTime date)
-        {
-            return (int)(date.ToUniversalTime().Subtract(new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc)).TotalDays / 1);
-        }
-        public static DateTime ConvertDaysToDate(int days)
-        {
-            return new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc).AddDays(days);
-        }
-
-        private static bool IsCategory(SpringBattle battle, RatingCategory category)
+        private bool IsCategory(SpringBattle battle, RatingCategory category)
         {
             int battleID = -1;
             try

ZkData/Ef/WHR/WholeHistoryRating.cs

@@ -42,9 +42,11 @@ public class WholeHistoryRating : IRatingSystem
 
         private bool runningInitialization = true;
         private readonly RatingCategory category;
+        private readonly RatingSystems handler;
 
-        public WholeHistoryRating(RatingCategory category)
+        public WholeHistoryRating(RatingCategory category, RatingSystems handler)
         {
+            this.handler = handler;
             this.category = category;
             w2 = GlobalConst.EloDecayPerDaySquared;
             ladderRecalculationTimer = new Timer((t) => { UpdateRatings(); }, this, 15 * 60000, (int)(GlobalConst.LadderUpdatePeriod * 3600 * 1000 + 4242));
@@ -101,7 +103,7 @@ public void ProcessBattle(SpringBattle battle)
                 else
                 {
                     createGame(losers, winners, false, date, battle.SpringBattleID);
-                    if (RatingSystems.Initialized)
+                    if (handler.Initialized)
                     {
                         Trace.TraceInformation(battlesRegistered + " battles registered for WHR " + category +", latest Battle: " + battle.SpringBattleID);
                         UpdateRatings();
@@ -190,9 +192,9 @@ public void RemoveTopPlayerUpdateListener(ITopPlayersUpdateListener listener, in
         private readonly object updateLockInternal = new object();
         private readonly object dbLock = new object();
 
-        public void UpdateRatings()
+        public void UpdateRatings(Action UpdateCompleted = null)
         {
-            if (!RatingSystems.Initialized) return;
+            if (!handler.Initialized) return;
             if (latestBattle == null)
             {
                 //Trace.TraceInformation("WHR " + category +": No battles to evaluate");
@@ -262,6 +264,7 @@ public void UpdateRatings()
                                 db.SaveChanges();
                             }
                             RatingsUpdated(this, new RatingUpdate() { affectedPlayers = updatedRanks });
+                            if (UpdateCompleted != null) UpdateCompleted.Invoke();
                         }
                     }
                     catch (Exception ex)
@@ -361,7 +364,7 @@ public void SaveToDB()
 
         public string DebugPlayer(Account player)
         {
-            if (!RatingSystems.Initialized) return "";
+            if (!handler.Initialized) return "";
             if (!players.ContainsKey(player.AccountID)) return "Unknown player";
             string debugString = "";
             foreach (PlayerDay d in players[player.AccountID].days)