-
Notifications
You must be signed in to change notification settings - Fork 573
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
rpc: reset transport version via reconnect_transport #5520
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
75d5040
rpc: set reply version on error
dotnwat 2dcc1b9
rpc: disambiguate timeout errors from other exceptions
dotnwat dfe2e13
rpc: privatize internal apis
dotnwat ddbf0cc
rpc: reset transport version on connect
dotnwat f3c6b5f
rpc: log policy violations at error level
dotnwat 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 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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -112,6 +112,8 @@ class transport final : public net::base_transport { | |
* version level used when dispatching requests. this value may change | ||
* during the lifetime of the transport. for example the version may be | ||
* upgraded if it is discovered that a server supports a newer version. | ||
* | ||
* reset to v1 in reset_state() to support reconnect_transport. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nice |
||
*/ | ||
transport_version _version{transport_version::v1}; | ||
|
||
|
@@ -170,7 +172,7 @@ ss::future<result<rpc::client_context<T>>> parse_result( | |
} | ||
if (protocol_violation) { | ||
vlog( | ||
rpclog.warn, | ||
rpclog.error, | ||
"Protocol violation: request version {} incompatible with " | ||
"reply version {}", | ||
req_ver, | ||
|
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.
This makes me think it'd be nice to be able to add a
vassert
that we never send a v0netbuf
over the wire, e.g. insend_reply()
. I don't think we can though since we'll still send v0 over the wire if talking to an old server (though it gets ignored regardless)Another thought is that we could use some
simple_reply_buf
around the simple protocol instead ofnetbuf
that is constructed with an initial version (even if it's just_version
).I don't feel strongly that either of these would be much better than what's there, but just brainstorming ways we can be sure our sent bytes are reasonable
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.
correct
i think the right move would be to add a constructor to netbuf so it can't be constructed without providing a version
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.
Yea that seems reasonable too. I was initially worried we'd end up with some lifecycle issues, e.g. not knowing what the right version is at time of construction, but I agree baking this into netbuf would feel better