-
Notifications
You must be signed in to change notification settings - Fork 3.2k
Improve linger/timeout validation error message with aliases #5314
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
MXLange
wants to merge
1
commit into
confluentinc:master
Choose a base branch
from
MXLange:fix/linger-timeout-error-aliases
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+10
−3
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -4429,8 +4429,13 @@ const char *rd_kafka_conf_finalize(rd_kafka_type_t cltype, | |||||||||||||
| conf->buffering_max_ms_dbl) { | ||||||||||||||
| if (rd_kafka_conf_is_modified(conf, | ||||||||||||||
| "linger.ms")) | ||||||||||||||
| return "`message.timeout.ms` must be " | ||||||||||||||
| "greater than `linger.ms`"; | ||||||||||||||
| return "`delivery.timeout.ms` " | ||||||||||||||
| "(alias " | ||||||||||||||
| "`message.timeout.ms`) " | ||||||||||||||
| "must be greater than " | ||||||||||||||
| "`linger.ms` " | ||||||||||||||
| "(alias " | ||||||||||||||
| "`queue.buffering.max.ms`)"; | ||||||||||||||
| else /* Auto adjust linger.ms to be lower | ||||||||||||||
| * than message.timeout.ms */ | ||||||||||||||
| conf->buffering_max_ms_dbl = | ||||||||||||||
|
|
@@ -4506,7 +4511,9 @@ const char *rd_kafka_topic_conf_finalize(rd_kafka_type_t cltype, | |||||||||||||
| if (tconf->message_timeout_ms != 0 && | ||||||||||||||
| (double)tconf->message_timeout_ms <= conf->buffering_max_ms_dbl && | ||||||||||||||
| rd_kafka_conf_is_modified(conf, "linger.ms")) | ||||||||||||||
| return "`message.timeout.ms` must be greater than `linger.ms`"; | ||||||||||||||
| return "`delivery.timeout.ms` " | ||||||||||||||
| "(alias `message.timeout.ms`) must be greater than " | ||||||||||||||
| "`linger.ms` (alias `queue.buffering.max.ms`)"; | ||||||||||||||
|
Comment on lines
+4514
to
+4516
|
||||||||||||||
| return "`delivery.timeout.ms` " | |
| "(alias `message.timeout.ms`) must be greater than " | |
| "`linger.ms` (alias `queue.buffering.max.ms`)"; | |
| return "`message.timeout.ms` " | |
| "(alias `delivery.timeout.ms`) must be greater than " | |
| "`queue.buffering.max.ms` (alias `linger.ms`)"; |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The alias relationships in this error message are backwards. According to the configuration definitions:
message.timeout.ms(line 1730) is the primary/canonical property, anddelivery.timeout.ms(line 1742) is an alias for itqueue.buffering.max.ms(line 1579) is the primary/canonical property, andlinger.ms(line 1588) is an alias for itThe error message should say:
message.timeout.ms(aliasdelivery.timeout.ms) must be greater thanqueue.buffering.max.ms(aliaslinger.ms)This would correctly show the canonical property first, followed by its alias in parentheses.