changefeedccl: match nil metrics behaviour#118421
Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom Jan 30, 2024
Merged
changefeedccl: match nil metrics behaviour#118421craig[bot] merged 1 commit intocockroachdb:masterfrom
craig[bot] merged 1 commit intocockroachdb:masterfrom
Conversation
|
It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR? 🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf. |
Member
|
This change is |
3dd9a40 to
6660cd8
Compare
Previously, `validateExternalConnectionSinkURI` would validate the changefeed sink URI by creating a fake sink and passing `nil` for `metricsRecorder`. This is usually not problematic since the sink is never used. A new patch, cockroachdb#117693, is now changing this and calling `metricsBuilder` interface method inside `makeKafkaSink`. To resolve this, this patch changes getSink in `validateExternalConnectionSinkURI` to pass in `(*sliMetrics)(nil)` to avoid calling methods on a nil interface. See also: cockroachdb#117693 Release note: none Epic: none
6660cd8 to
7c05a07
Compare
Contributor
Author
|
Alternatively, we can check if m is nil here and return nilMetricsRecorderBuilder(recordingRequired) if it is. wdyt? cockroach/pkg/ccl/changefeedccl/sink.go Lines 211 to 216 in cb674c2 |
miretskiy
approved these changes
Jan 30, 2024
Contributor
Author
|
TFTR!! bors r=miretskiy |
Contributor
|
Build succeeded: |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Previously,
validateExternalConnectionSinkURIwould validate the changefeedsink URI by creating a fake sink and passing
nilformetricsRecorder. Thisis usually not problematic since the sink is never used. A new patch, #117693,
is now changing this and calling
metricsBuilderinterface method insidemakeKafkaSink. To resolve this, this patch changes getSink invalidateExternalConnectionSinkURIto pass in(*sliMetrics)(nil)to avoidcalling methods on a nil interface.
See also: #117693
Release note: none
Epic: none