K8SPXC-1509: Fix reconciler error when PiTR enabled #1879
+50
−29
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
gkech
reviewed
Jan 15, 2025
Comment on lines
+38
to
+43
| switch res { | ||
| case controllerutil.OperationResultCreated: | ||
| log.Info("Created binlog collector", "name", binlogCollector.Name) | ||
| case controllerutil.OperationResultUpdated: | ||
| log.Info("Updated binlog collector", "name", binlogCollector.Name) | ||
| } |
There was a problem hiding this comment.
Why don't we log res regardless of its status and we are switching only for these 2 cases? The status has an underlying type of string, which already has the information we want.
There was a problem hiding this comment.
we can do something like this, but i prefer the current version tbh
Suggested change
| switch res { | |
| case controllerutil.OperationResultCreated: | |
| log.Info("Created binlog collector", "name", binlogCollector.Name) | |
| case controllerutil.OperationResultUpdated: | |
| log.Info("Updated binlog collector", "name", binlogCollector.Name) | |
| } | |
| if res != controllerutil.OperationResultNone { | |
| log.Info("Reconciled binlog collector", "name", binlogCollector.Name, "operation", res) | |
| } |
gkech
reviewed
Jan 15, 2025
Comment on lines
+42
to
+43
| if err := r.reconcileBinlogCollector(ctx, cr); err != nil { | ||
| return errors.Wrap(err, "reconcile binlog collector") |
There was a problem hiding this comment.
Discussed with @egegunes that if can also add a unit test for the controller if we have some time
There was a problem hiding this comment.
i spend some time on this but binlog collector is only reconciled after cluster is ready and unfortunately on envtest we have no means to make cluster ready
There was a problem hiding this comment.
alright thanks for checking this
gkech
approved these changes
Jan 22, 2025
commit: c3439e3 |
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.
CHANGE DESCRIPTION
Fix temporary
resource name may not be emptyerror when PiTR enabled on a running cluster.CHECKLIST
Jira
Needs Doc) and QA (Needs QA)?Tests
compare/*-oc.yml)?Config/Logging/Testability