rpc: introduce ClientConn and ServerConn interfaces #4905
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
The underlying rpc.Conn is bidirectional, but in our use case we always send requests from the client to the server which responds. Hide rpc.NewConn and replace it with a pair of NewClientConn and NewServerConn methods to deliniate the method sets of both types so they can be mocked.
ClientConn.Start is always called on return from rpc.NewClientConn, so just make NewClientConn call Start before returning. This simplifies the rpc client API.
| @@ -234,7 +235,7 @@ func (a *CallbackMethods) Factorial(x int64val) (int64val, error) { | |||
| return int64val{1}, nil | |||
| } | |||
| var r int64val | |||
| err := a.root.conn.Call(rpc.Request{"CallbackMethods", 0, "", "Factorial"}, int64val{x.I - 1}, &r) | |||
| err := a.root.conn.(rpc.ClientConn).Call(rpc.Request{"CallbackMethods", 0, "", "Factorial"}, int64val{x.I - 1}, &r) | |||
There was a problem hiding this comment.
Can we please make this two lines?
client := a.root.conn.(rpc.ClientConn)
err := client.Call(...)
|
The diff was much larger than necessary due to the renaming the receiver of 'conn' -> 'c'. However, LGTM with one suggestion. |
That's because |
|
|
|
Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju |
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.
This PR is in preparation for adding tests for retrying temporary RPC errors.
It introduces two new interface types,
rpc.ClientConnandrpc.ServerConnwhose purposes are self explanatory. Also provide constructor functions for these new interface types asNewConnhas been unexported.Remove the ability to provide a RequestNotifier when requesting a ClientConn, this was never used by any non test caller and is only part of the bidirectional code for the rpc package, which is also unused by juju.
Adjust the callers in the
apiandapiserverpackages to these new interfaces, very few changes were needed apart from adjusting the types in various wrapper types.The bidirection nature of the rpc package remains, but if needed the caller must assert their ServerConn value to a ClientConn, or vice versa. No code in Juju does this, but the rpc tests assert this behaviour
Finally, unexport
rpc.Conn.