NowChess/NowChessSystems
4
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

fix: remove unused clearDrainingByPodName method and update HealthMonitor to clear draining instances
Build & Test (NowChessSystems) TeamCity build finished
Details

Browse Source
This commit is contained in:
Janis
2026-05-17 13:49:03 +02:00
parent 255f43ddda
commit 1a02f9e186
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/coordinator/src/main/scala/de/nowchess/coordinator/service/AutoScaler.scala
-3
View File
@@ -50,9 +50,6 @@ class AutoScaler:
def clearDraining(instanceId: String): Unit = def clearDraining(instanceId: String): Unit =
drainingForScaleDown.remove(instanceId) drainingForScaleDown.remove(instanceId)
def clearDrainingByPodName(podName: String): Unit =
drainingForScaleDown.asScala.find(id => id.contains(podName)).foreach(drainingForScaleDown.remove)
private def kubeClientOpt: Option[KubernetesClient] = private def kubeClientOpt: Option[KubernetesClient] =
if kubeClientInstance.isUnsatisfied then None if kubeClientInstance.isUnsatisfied then None
else Some(kubeClientInstance.get()) else Some(kubeClientInstance.get())
modules/coordinator/src/main/scala/de/nowchess/coordinator/service/HealthMonitor.scala
+1 -1
View File
@@ -89,6 +89,7 @@ class HealthMonitor:
log.warnf("Evicted %d stale instances: %s", evicted.size, evicted.mkString(", ")) log.warnf("Evicted %d stale instances: %s", evicted.size, evicted.mkString(", "))
evicted.foreach(deleteK8sPod) evicted.foreach(deleteK8sPod)
val unexpectedEvictions = evicted.filterNot(autoScaler.isDrainingForScaleDown) val unexpectedEvictions = evicted.filterNot(autoScaler.isDrainingForScaleDown)
evicted.foreach(autoScaler.clearDraining)
if unexpectedEvictions.nonEmpty then autoScaler.scaleUp() if unexpectedEvictions.nonEmpty then autoScaler.scaleUp()
val instances = instanceRegistry.getAllInstances val instances = instanceRegistry.getAllInstances
val failed = instances.collect { inst => val failed = instances.collect { inst =>
@@ -230,7 +231,6 @@ class HealthMonitor:
private def handlePodGone(pod: Pod): Unit = private def handlePodGone(pod: Pod): Unit =
val podName = pod.getMetadata.getName val podName = pod.getMetadata.getName
autoScaler.clearDrainingByPodName(podName)
findRegisteredInstance(pod).foreach { inst => findRegisteredInstance(pod).foreach { inst =>
log.warnf("Pod %s deleted — triggering failover for %s", podName, inst.instanceId) log.warnf("Pod %s deleted — triggering failover for %s", podName, inst.instanceId)
failoverService failoverService