public_git
/
actions-runner-controller
mirror of https://github.com/actions-runner-controller/actions-runner-controller.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix possible flapping autoscale on runner update (#371) 

Addresses https://github.com/summerwind/actions-runner-controller/pull/355#discussion_r587199428
This commit is contained in:
Yusuke Kuoka 2021-03-05 10:21:20 +09:00 committed by GitHub
parent 11e58fcc41
commit 4fa5315311
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
controllers/autoscaling.go
View File

@ -296,27 +296,46 @@ func (r *HorizontalRunnerAutoscalerReconciler) calculateReplicasByPercentageRunn
if err != nil { if err != nil {
return nil, err return nil, err
} }
numRunners := len(runnerList.Items)
numRunnersBusy := 0 var desiredReplicasBefore int
if v := rd.Spec.Replicas; v == nil {
desiredReplicasBefore = 1
} else {
desiredReplicasBefore = *v
}
var (
numRunners int
numRunnersRegistered int
numRunnersBusy int
)
numRunners = len(runnerList.Items)
for _, runner := range runners { for _, runner := range runners {
if _, ok := runnerMap[*runner.Name]; ok && runner.GetBusy() { if _, ok := runnerMap[*runner.Name]; ok {
numRunnersRegistered++
if runner.GetBusy() {
numRunnersBusy++ numRunnersBusy++
} }
} }
}
var desiredReplicas int var desiredReplicas int
fractionBusy := float64(numRunnersBusy) / float64(numRunners) fractionBusy := float64(numRunnersBusy) / float64(desiredReplicasBefore)
if fractionBusy >= scaleUpThreshold { if fractionBusy >= scaleUpThreshold {
if scaleUpAdjustment > 0 { if scaleUpAdjustment > 0 {
desiredReplicas = numRunners + scaleUpAdjustment desiredReplicas = desiredReplicasBefore + scaleUpAdjustment
} else { } else {
desiredReplicas = int(math.Ceil(float64(numRunners) * scaleUpFactor)) desiredReplicas = int(math.Ceil(float64(desiredReplicasBefore) * scaleUpFactor))
} }
} else if fractionBusy < scaleDownThreshold { } else if fractionBusy < scaleDownThreshold {
if scaleDownAdjustment > 0 { if scaleDownAdjustment > 0 {
desiredReplicas = numRunners - scaleDownAdjustment desiredReplicas = desiredReplicasBefore - scaleDownAdjustment
} else { } else {
desiredReplicas = int(float64(numRunners) * scaleDownFactor) desiredReplicas = int(float64(desiredReplicasBefore) * scaleDownFactor)
} }
} else { } else {
desiredReplicas = *rd.Spec.Replicas desiredReplicas = *rd.Spec.Replicas
@ -328,13 +347,19 @@ func (r *HorizontalRunnerAutoscalerReconciler) calculateReplicasByPercentageRunn
desiredReplicas = maxReplicas desiredReplicas = maxReplicas
} }
// NOTES for operators:
//
// - num_runners can be as twice as large as replicas_desired_before while
// the runnerdeployment controller is replacing RunnerReplicaSet for runner update.
r.Log.V(1).Info( r.Log.V(1).Info(
"Calculated desired replicas", "Calculated desired replicas",
"computed_replicas_desired", desiredReplicas, "replicas_min", minReplicas,
"spec_replicas_min", minReplicas, "replicas_max", maxReplicas,
"spec_replicas_max", maxReplicas, "replicas_desired_before", desiredReplicasBefore,
"current_replicas", rd.Spec.Replicas, "replicas_desired", desiredReplicas,
"num_runners", numRunners, "num_runners", numRunners,
"num_runners_registered", numRunnersRegistered,
"num_runners_busy", numRunnersBusy, "num_runners_busy", numRunnersBusy,
"namespace", hra.Namespace, "namespace", hra.Namespace,
"runner_deployment", rd.Name, "runner_deployment", rd.Name,