Cleanup of staled rounds (2)

project-dkg · Sep 7, 2024 · fa13d78 · fa13d78
1 parent bbbaca1
commit fa13d78
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 6 deletions.
diff --git a/dkgNodesTests/RoundStatus.Tests.cs b/dkgNodesTests/RoundStatus.Tests.cs
@@ -109,8 +109,7 @@ public void TestNextStatus()
         [Test]
         public void TestCancelStatus()
         {
-            RoundStatus roundStatus = RoundStatusConstants.Started;
-            Assert.That(roundStatus.CancelStatus(), Is.EqualTo(RoundStatusConstants.Cancelled));
+            Assert.That(RoundStatus.CancelStatus(), Is.EqualTo(RoundStatusConstants.Cancelled));
         }
 
         [Test]

diff --git a/dkgServiceNode/Controllers/OpsController.cs b/dkgServiceNode/Controllers/OpsController.cs
@@ -72,6 +72,8 @@ public async Task<ActionResult<StatusResponse>> RegisterNode(Node node)
             Stopwatch stopwatch = new();
             stopwatch.Start();
 
+            await UpdateRunningRoundsIfNeeded();
+
             ActionResult<StatusResponse> res;
             bool verified = false;
 
@@ -576,5 +578,25 @@ internal async Task UpdateRoundState(Round round)
             }
         }
 
+        private static DateTime lastUpdateRunningRoundsTime = DateTime.MinValue;
+        private static readonly TimeSpan updateRunningRoundsInterval = TimeSpan.FromSeconds(120);
+
+        internal async Task UpdateRunningRounds()
+        {
+            var rounds = dkgContext.GetAllRounds().Where(r => RoundStatus.IsRunning(r.Status));
+            foreach (var round in rounds)
+            {
+                await UpdateRoundState(round);
+            }
+        }
+        private async Task UpdateRunningRoundsIfNeeded()
+        {
+            if (DateTime.Now - lastUpdateRunningRoundsTime >= updateRunningRoundsInterval)
+            {
+                await UpdateRunningRounds();
+                lastUpdateRunningRoundsTime = DateTime.Now;
+            }
+        }
+
     }
 }
diff --git a/dkgServiceNode/Controllers/RoundsController.cs b/dkgServiceNode/Controllers/RoundsController.cs
@@ -32,9 +32,6 @@
 using dkgServiceNode.Services.RoundRunner;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
-using System.Collections.Generic;
-using System.Xml.Linq;
-using Microsoft.Extensions.DependencyInjection;
 using dkgServiceNode.Services.Cache;
 
 namespace dkgServiceNode.Controllers

diff --git a/dkgServiceNode/Data/DbEnsure.cs b/dkgServiceNode/Data/DbEnsure.cs
@@ -259,6 +259,7 @@ public static void Ensure(string connectionString)
             Ensure_0_8_0(connection);
             EnsureVersion("0.12.1", sqlScript_0_12_1, connection);
             PuVersionUpdate("0.12.4", connection);
+            PuVersionUpdate("0.12.5", connection);
         }
     }
 

diff --git a/dkgServiceNode/Models/Round.cs b/dkgServiceNode/Models/Round.cs
@@ -111,7 +111,7 @@ public RoundStatus NextStatus
         [NotMapped]
         public RoundStatus CancelStatus
         {
-            get { return Status.CancelStatus(); }
+            get { return RoundStatus.CancelStatus(); }
         }
 
         [JsonIgnore]