changefeedccl: fix flush_hist_nanos callback #128991
Open
+1
−15
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
The flush_hist_nanos metric is calculated in a metrics callback. Before this change, the cloud storage and webhook v1 sinks would immediately call the callback before performing flush logic, which led to unexpectedly small flush_hist_nanos. This change moves the callback out of sink-specific logic so that the callback is correctly deferred for all sinks. Epic: CRDB-37337 Fixes: cockroachdb#121248 Release note (bug fix): The changefeed.flush_hist_nanos metric now tracks the time it takes to flush for the cloud storage and old webhook sinks. Before this change, changefeed.flush_hist_nanos would appear erroneously as near 0 for these sinks.
![blathers[crl]](https://avatars.githubusercontent.com/in/59700?s=40&u=373d9101a12edc3847d2fb6ae78e3adcfb4ca41e&v=4){kind=avatar}
|
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. |
|
This change is |
rharding6373
added
backport-23.2.x
wenyihu6
reviewed
Aug 15, 2024
There was a problem hiding this comment.
Reviewable status:
complete! 0 of 0 LGTMs obtained (waiting on @rharding6373)
pkg/ccl/changefeedccl/batching_sink.go line 120 at r1 (raw file):
// Flush implements the Sink interface, returning the first error that has // occured in the past EmitRow calls. func (s *batchingSink) Flush(ctx context.Context) error {
It seems that batchingSink.Flush is called during `EmitResolvedTimestamp` https://github.com/cockroachdb/cockroach/blob/17a0dc8a17f1bf3c00ffe62deb1caef03faac946/pkg/ccl/changefeedccl/batching\_sink.go#L230 as well. I see similar inconsistencies for pulsar, sql sinks.
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.
The flush_hist_nanos metric is calculated in a metrics callback. Before this change, the cloud storage and webhook v1 sinks would immediately call the callback before performing flush logic, which led to unexpectedly small flush_hist_nanos. This change moves the callback out of sink-specific logic so that the callback is correctly deferred for all sinks.
Epic: CRDB-37337
Fixes: #121248
Release note (bug fix): The changefeed.flush_hist_nanos metric now tracks the time it takes to flush for the cloud storage and old webhook sinks. Before this change, changefeed.flush_hist_nanos would appear erroneously as near 0 for these sinks.