Refactored fallback logic to only patch status when the fallback is e… #5659
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…nabled Signed-off-by: Bharath Guvvala <bharath.raghavendra@gmail.com>
Signed-off-by: Bharath Guvvala <bharath.raghavendra@gmail.com>
JorTurFer
reviewed
Apr 7, 2024
There was a problem hiding this comment.
LGTM! Could you update the changelog linking the fixed issue? I think that improvements can be the better fit considering that this will improve the performance.
@zroubalik @dttung2905 PTAL if you have time :)
|
/run-e2e |
|
@bharathguvvala , could you check the failing CI checks? I think that unit tests probably need to be updated as they expect the call to |
zroubalik
approved these changes
Apr 8, 2024
zroubalik
reviewed
Apr 10, 2024
Signed-off-by: Bharath Guvvala <bharath.raghavendra@gmail.com>
Signed-off-by: Bharath Guvvala <bharath.raghavendra@gmail.com>
JorTurFer
reviewed
Apr 11, 2024
pkg/fallback/fallback_test.go
Outdated
| @@ -67,7 +67,7 @@ var _ = Describe("fallback", func() { | |||
| primeGetMetrics(scaler, expectedMetricValue) | |||
| so := buildScaledObject(nil, nil) | |||
| metricSpec := createMetricSpec(3) | |||
| expectStatusPatch(ctrl, client) | |||
| //expectStatusPatch(ctrl, client) | |||
There was a problem hiding this comment.
If this isn't required, can we remove the code? it's confusing for new folks
There was a problem hiding this comment.
Sorry about the latest changes, I am testing out the fixes made to the tests. These will be removed in the final version.
There was a problem hiding this comment.
Somehow these fixes are working locally and CI is breaking. Give me sometime to fix this.
There was a problem hiding this comment.
sure, no worries xD
I thought that it was ready to review, but if you are working on it, just let me know when it's ready 😄
pkg/fallback/fallback_test.go
Outdated
| @@ -114,7 +114,7 @@ var _ = Describe("fallback", func() { | |||
|
|
|||
| so := buildScaledObject(nil, nil) | |||
| metricSpec := createMetricSpec(3) | |||
| expectStatusPatch(ctrl, client) | |||
| //expectStatusPatch(ctrl, client) | |||
Comment on lines
+133
to
+134
| //mockClient.EXPECT().Status().Return(mockStatusWriter) | ||
| //mockStatusWriter.EXPECT().Patch(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil) |
| @@ -153,7 +153,7 @@ func TestGetScaledObjectMetrics_FromCache(t *testing.T) { | |||
| recorder := record.NewFakeRecorder(1) | |||
| mockClient := mock_client.NewMockClient(ctrl) | |||
| mockExecutor := mock_executor.NewMockScaleExecutor(ctrl) | |||
| mockStatusWriter := mock_client.NewMockStatusWriter(ctrl) | |||
| //mockStatusWriter := mock_client.NewMockStatusWriter(ctrl) | |||
Comment on lines
+224
to
+225
| //mockClient.EXPECT().Status().Return(mockStatusWriter) | ||
| //mockStatusWriter.EXPECT().Patch(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil) |
| @@ -259,7 +259,7 @@ func TestGetScaledObjectMetrics_InParallel(t *testing.T) { | |||
| recorder := record.NewFakeRecorder(1) | |||
| mockClient := mock_client.NewMockClient(ctrl) | |||
| mockExecutor := mock_executor.NewMockScaleExecutor(ctrl) | |||
| mockStatusWriter := mock_client.NewMockStatusWriter(ctrl) | |||
| //mockStatusWriter := mock_client.NewMockStatusWriter(ctrl) | |||
Comment on lines
+356
to
+357
| //mockClient.EXPECT().Status().Times(len(metricNames)).Return(mockStatusWriter) | ||
| //mockStatusWriter.EXPECT().Patch(gomock.Any(), gomock.Any(), gomock.Any()).Times(len(metricNames)).Return(nil) |
| @@ -907,7 +907,7 @@ func TestScalingModifiersFormula(t *testing.T) { | |||
| recorder := record.NewFakeRecorder(1) | |||
| mockClient := mock_client.NewMockClient(ctrl) | |||
| mockExecutor := mock_executor.NewMockScaleExecutor(ctrl) | |||
| mockStatusWriter := mock_client.NewMockStatusWriter(ctrl) | |||
| //mockStatusWriter := mock_client.NewMockStatusWriter(ctrl) | |||
Comment on lines
+1001
to
+1002
| //mockClient.EXPECT().Status().Return(mockStatusWriter).Times(2) | ||
| //mockStatusWriter.EXPECT().Patch(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil).Times(2) |
Signed-off-by: Bharath Guvvala <bharath.raghavendra@gmail.com>
Signed-off-by: Bharath Guvvala <bharath.raghavendra@gmail.com>
Signed-off-by: Bharath Guvvala <bharath.raghavendra@gmail.com>
Signed-off-by: Bharath Guvvala <bharath.raghavendra@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…nabled
This change ensures that the update health status of the scaledObjects is only updated when the fallback configuration is enabled on the scaledobject. Further optimizations to avoid redundant updates when the status doesn't change can be done later. Tests will be added, if the change is ratified by the maintainers.
Checklist
Fixes #5624