Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Fallback calculation returns correct value #4263

Merged
merged 5 commits into from
Feb 22, 2023
Merged

fix: Fallback calculation returns correct value #4263

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8c18251
fix: Fallback calculation returns correct value
JorTurFer Feb 21, 2023
54750e4
remove unrelated change
JorTurFer Feb 21, 2023
6df6eba
reduce stabilization window
JorTurFer Feb 22, 2023
5d48144
set scaling value after restarting the server
JorTurFer Feb 22, 2023
093fb01
set scaling value after restarting the server
JorTurFer Feb 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ Here is an overview of all new **experimental** features:

### Fixes

- **General**: Fix regression in fallback mechanism ([#4249](https://github.com/kedacore/keda/issues/4249))
- **General**: Prevent a panic that might occur while refreshing a scaler cache ([#4092](https://github.com/kedacore/keda/issues/4092))
- **Azure Service Bus Scaler:** Use correct auth flows with pod identity ([#4026](https://github.com/kedacore/keda/issues/4026)|[#4123](https://github.com/kedacore/keda/issues/4123))
- **Cassandra Scaler**: Checking whether the port information is entered in the ClusterIPAddres is done correctly. ([#4110](https://github.com/kedacore/keda/issues/4110))
Expand Down
4 changes: 2 additions & 2 deletions pkg/fallback/fallback.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,10 @@ func validateFallback(scaledObject *kedav1alpha1.ScaledObject) bool {

func doFallback(scaledObject *kedav1alpha1.ScaledObject, metricSpec v2.MetricSpec, metricName string, suppressedError error) []external_metrics.ExternalMetricValue {
replicas := int64(scaledObject.Spec.Fallback.Replicas)
normalisationValue, _ := metricSpec.External.Target.AverageValue.AsInt64()
normalisationValue := metricSpec.External.Target.AverageValue.AsApproximateFloat64()
metric := external_metrics.ExternalMetricValue{
MetricName: metricName,
Value: *resource.NewQuantity(normalisationValue*replicas, resource.DecimalSI),
Value: *resource.NewMilliQuantity(int64(normalisationValue*1000)*replicas, resource.DecimalSI),
Timestamp: metav1.Now(),
}
fallbackMetrics := []external_metrics.ExternalMetricValue{metric}
Expand Down
20 changes: 10 additions & 10 deletions pkg/fallback/fallback_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ var _ = Describe("fallback", func() {

It("should return the expected metric when fallback is disabled", func() {

expectedMetricValue := int64(5)
expectedMetricValue := float64(5)
primeGetMetrics(scaler, expectedMetricValue)
so := buildScaledObject(nil, nil)
metricSpec := createMetricSpec(3)
Expand All @@ -73,12 +73,12 @@ var _ = Describe("fallback", func() {
metrics, err = GetMetricsWithFallback(context.Background(), client, metrics, err, metricName, so, metricSpec)

Expect(err).ToNot(HaveOccurred())
value, _ := metrics[0].Value.AsInt64()
value := metrics[0].Value.AsApproximateFloat64()
Expect(value).Should(Equal(expectedMetricValue))
})

It("should reset the health status when scaler metrics are available", func() {
expectedMetricValue := int64(6)
expectedMetricValue := float64(6)
startingNumberOfFailures := int32(5)
primeGetMetrics(scaler, expectedMetricValue)

Expand All @@ -104,7 +104,7 @@ var _ = Describe("fallback", func() {
metrics, err = GetMetricsWithFallback(context.Background(), client, metrics, err, metricName, so, metricSpec)

Expect(err).ToNot(HaveOccurred())
value, _ := metrics[0].Value.AsInt64()
value := metrics[0].Value.AsApproximateFloat64()
Expect(value).Should(Equal(expectedMetricValue))
Expect(so.Status.Health[metricName]).To(haveFailureAndStatus(0, kedav1alpha1.HealthStatusHappy))
})
Expand Down Expand Up @@ -156,7 +156,7 @@ var _ = Describe("fallback", func() {
It("should return a normalised metric when number of failures are beyond threshold", func() {
scaler.EXPECT().GetMetricsAndActivity(gomock.Any(), gomock.Eq(metricName)).Return(nil, false, errors.New("Some error"))
startingNumberOfFailures := int32(3)
expectedMetricValue := int64(100)
expectedMetricValue := float64(100)

so := buildScaledObject(
&kedav1alpha1.Fallback{
Expand All @@ -179,7 +179,7 @@ var _ = Describe("fallback", func() {
metrics, err = GetMetricsWithFallback(context.Background(), client, metrics, err, metricName, so, metricSpec)

Expect(err).ToNot(HaveOccurred())
value, _ := metrics[0].Value.AsInt64()
value := metrics[0].Value.AsApproximateFloat64()
Expect(value).Should(Equal(expectedMetricValue))
Expect(so.Status.Health[metricName]).To(haveFailureAndStatus(4, kedav1alpha1.HealthStatusFailing))
})
Expand Down Expand Up @@ -209,7 +209,7 @@ var _ = Describe("fallback", func() {
It("should ignore error if we fail to update kubernetes status", func() {
scaler.EXPECT().GetMetricsAndActivity(gomock.Any(), gomock.Eq(metricName)).Return(nil, false, errors.New("Some error"))
startingNumberOfFailures := int32(3)
expectedMetricValue := int64(100)
expectedMetricValue := float64(100)

so := buildScaledObject(
&kedav1alpha1.Fallback{
Expand All @@ -235,7 +235,7 @@ var _ = Describe("fallback", func() {
metrics, err = GetMetricsWithFallback(context.Background(), client, metrics, err, metricName, so, metricSpec)

Expect(err).ToNot(HaveOccurred())
value, _ := metrics[0].Value.AsInt64()
value := metrics[0].Value.AsApproximateFloat64()
Expect(value).Should(Equal(expectedMetricValue))
Expect(so.Status.Health[metricName]).To(haveFailureAndStatus(4, kedav1alpha1.HealthStatusFailing))
})
Expand Down Expand Up @@ -411,10 +411,10 @@ func buildScaledObject(fallbackConfig *kedav1alpha1.Fallback, status *kedav1alph
return scaledObject
}

func primeGetMetrics(scaler *mock_scalers.MockScaler, value int64) {
func primeGetMetrics(scaler *mock_scalers.MockScaler, value float64) {
expectedMetric := external_metrics.ExternalMetricValue{
MetricName: metricName,
Value: *resource.NewQuantity(value, resource.DecimalSI),
Value: *resource.NewQuantity(int64(value), resource.DecimalSI),
Timestamp: metav1.Now(),
}

Expand Down
4 changes: 4 additions & 0 deletions tests/internals/fallback/fallback_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ spec:
failureThreshold: 3
replicas: {{.DefaultFallback}}
cooldownPeriod: 1
pollingInterval: 5
triggers:
- type: metrics-api
metadata:
Expand Down Expand Up @@ -252,6 +253,9 @@ func testFallback(t *testing.T, kc *kubernetes.Clientset, data templateData) {
KubectlApplyWithTemplate(t, data, "fallbackMSDeploymentTemplate", fallbackMSDeploymentTemplate)
assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, namespace, defaultFallback, 60, 3),
"replica count should be %d after 3 minutes", defaultFallback)
// We need to ensure that the fallback value is stable to cover this regression
// https://github.com/kedacore/keda/issues/4249
AssertReplicaCountNotChangeDuringTimePeriod(t, kc, deploymentName, namespace, defaultFallback, 180)
}

// restore MS to scale back from fallback replicas
Expand Down