From 842feea40b57c728be2f0ad841f31c79864d7b72 Mon Sep 17 00:00:00 2001 From: Yuchen Wang Date: Thu, 20 Mar 2025 11:34:34 -0700 Subject: [PATCH 1/3] use status code as downscale metrics --- pkg/controller/delay.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/controller/delay.go b/pkg/controller/delay.go index 7815b9e8d..5f6b090e3 100644 --- a/pkg/controller/delay.go +++ b/pkg/controller/delay.go @@ -8,6 +8,7 @@ import ( "io" "net/http" "net/url" + "strconv" "sync" "time" @@ -254,7 +255,7 @@ func callPerpareDownscaleAndReturnScalable(ctx context.Context, logger log.Logge defer resp.Body.Close() scalableMu.Lock() - downscaleProbeTotal.WithLabelValues(ep.podName, resp.Status).Inc() + downscaleProbeTotal.WithLabelValues(ep.podName, strconv.Itoa(resp.StatusCode)).Inc() if resp.StatusCode == 200 { scalable[ep.replica] = true } else { From 9e1be1ea63b97fffd031ea8c7c2903141a2c195f Mon Sep 17 00:00:00 2001 From: Yuchen Wang Date: Thu, 20 Mar 2025 11:38:12 -0700 Subject: [PATCH 2/3] do not cancel downscale --- pkg/controller/custom_resource_replicas.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/controller/custom_resource_replicas.go b/pkg/controller/custom_resource_replicas.go index a09426cc8..d5f94024a 100644 --- a/pkg/controller/custom_resource_replicas.go +++ b/pkg/controller/custom_resource_replicas.go @@ -39,7 +39,7 @@ func (c *RolloutController) adjustStatefulSetsGroupReplicasToMirrorResource(ctx c.desiredReplicas.WithLabelValues(sts.GetName()).Set(float64(referenceResourceDesiredReplicas)) if currentReplicas == referenceResourceDesiredReplicas { updateStatusReplicasOnReferenceResourceIfNeeded(ctx, c.logger, c.dynamicClient, sts, scaleObj, referenceGVR, referenceName, referenceResourceDesiredReplicas) - cancelDelayedDownscaleIfConfigured(ctx, c.logger, sts, client, referenceResourceDesiredReplicas) + // cancelDelayedDownscaleIfConfigured(ctx, c.logger, sts, client, referenceResourceDesiredReplicas) // No change in the number of replicas: don't log because this will be the result most of the time. continue } From d322a2704cab73de8524cfddd055e55eb84378d7 Mon Sep 17 00:00:00 2001 From: Yuchen Wang Date: Thu, 20 Mar 2025 11:40:48 -0700 Subject: [PATCH 3/3] do not cancel downscale --- pkg/controller/custom_resource_replicas.go | 2 +- pkg/controller/delay.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/controller/custom_resource_replicas.go b/pkg/controller/custom_resource_replicas.go index d5f94024a..a09426cc8 100644 --- a/pkg/controller/custom_resource_replicas.go +++ b/pkg/controller/custom_resource_replicas.go @@ -39,7 +39,7 @@ func (c *RolloutController) adjustStatefulSetsGroupReplicasToMirrorResource(ctx c.desiredReplicas.WithLabelValues(sts.GetName()).Set(float64(referenceResourceDesiredReplicas)) if currentReplicas == referenceResourceDesiredReplicas { updateStatusReplicasOnReferenceResourceIfNeeded(ctx, c.logger, c.dynamicClient, sts, scaleObj, referenceGVR, referenceName, referenceResourceDesiredReplicas) - // cancelDelayedDownscaleIfConfigured(ctx, c.logger, sts, client, referenceResourceDesiredReplicas) + cancelDelayedDownscaleIfConfigured(ctx, c.logger, sts, client, referenceResourceDesiredReplicas) // No change in the number of replicas: don't log because this will be the result most of the time. continue } diff --git a/pkg/controller/delay.go b/pkg/controller/delay.go index 5f6b090e3..657d32e7b 100644 --- a/pkg/controller/delay.go +++ b/pkg/controller/delay.go @@ -161,7 +161,7 @@ func parseDelayedDownscaleAnnotations(annotations map[string]string) (time.Durat delayStr := annotations[config.RolloutDelayedDownscaleAnnotationKey] urlStr := annotations[config.RolloutDelayedDownscalePrepareUrlAnnotationKey] - if delayStr == "" || urlStr == "" { + if delayStr == "" || delayStr == "boolean" || urlStr == "" { return 0, nil, nil }