changefeedccl/kvfeed: pass consumer id correctly #138939
Merged
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
Previously, we introduced the concept of a consumer ID to prevent a single changefeed job from over-consuming the catch-up scan quota and blocking other consumers from making progress on the server side. However, the changefeed client-side code requires the consumer ID to be passed again in the rangefeed options during rangefeedFactory.Run. This was missing in the previous PR, causing the changefeed job ID to default to zero. This patch fixes the issue by ensuring the consumer ID is correctly passed in the rangefeed options. Related: cockroachdb#133789 Release note: None
![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 |
wenyihu6
requested review from
andyyang890 and
stevendanna
and removed request for
a team
andyyang890
approved these changes
Jan 13, 2025
| @@ -97,6 +97,7 @@ func (p rangefeedFactory) Run(ctx context.Context, sink kvevent.Writer, cfg rang | |||
| if cfg.RangeObserver != nil { | |||
| rfOpts = append(rfOpts, kvcoord.WithRangeObserver(cfg.RangeObserver)) | |||
| } | |||
| rfOpts = append(rfOpts, kvcoord.WithConsumerID(cfg.ConsumerID)) | |||
There was a problem hiding this comment.
Should this have a != 0 check?
There was a problem hiding this comment.
The default value should be zero, so setting it shouldn't make a difference
cockroach/pkg/kv/kvclient/kvcoord/dist_sender_rangefeed.go
Lines 183 to 186 in ad6f23c
There was a problem hiding this comment.
I think it'd still be nice to not pass the functional option if we know it's not going to have an effect but no strong feelings either way.
stevendanna
approved these changes
Jan 14, 2025
|
TFTR! bors r=andyyang890, stevendanna |
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
Previously, we introduced the concept of a consumer ID to prevent a single
changefeed job from over-consuming the catch-up scan quota and blocking other
consumers from making progress on the server side. However, the changefeed
client-side code requires the consumer ID to be passed again in the rangefeed
options during rangefeedFactory.Run. This was missing in the previous
PR, causing the changefeed job ID to default to zero. This patch fixes
the issue by ensuring the consumer ID is correctly passed in the
rangefeed options.
Related: #133789
Release note: none
Epic: none