Expose ConnectivityState of a ClientConn. #1385
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
dfawley
reviewed
Jul 21, 2017
clientconn.go
Outdated
| @@ -476,6 +478,97 @@ func (s ConnectivityState) String() string { | |||
| } | |||
| } | |||
|
|
|||
| // connectivityStateEvaluator gets updated by addrConns when their | |||
| // stats transition, based on which it evaluates the state of | |||
clientconn.go
Outdated
| // connectivityStateEvaluator gets updated by addrConns when their | ||
| // stats transition, based on which it evaluates the state of | ||
| // ClientConn. | ||
| // Note: This code will eventully sit in the blanacer in the new design. |
clientconn.go
Outdated
| // before any addrConn is created ClientConn is in idle state. In the end when ClientConn | ||
| // closes it is in Shutdown state. | ||
| // TODO Note that in later releases, a ClientConn with no activity will be put into an Idle state. | ||
| func (csEvltr *connectivityStateEvaluator) recordTransition(oldState, newState ConnectivityState) { |
clientconn.go
Outdated
| @@ -841,8 +923,9 @@ func (ac *addrConn) resetTransport(closeTransport bool) error { | |||
| ac.down(downErrorf(false, true, "%v", errNetworkIO)) | |||
| ac.down = nil | |||
| } | |||
| oldState := ac.state | |||
There was a problem hiding this comment.
How about this:
updateState := func(new ConnectivityState) {
ac.csEvltr.recordTransition(ac.state, new)
ac.state = new
}
....
updateState(Connecting)
...
updateState(TransientFailure)
...| defer cc.Close() | ||
| wantState := Ready | ||
| if state, ok := assertState(wantState, cc); !ok { | ||
| t.Fatalf("asserState(%s) = %s, false, want %s, true", wantState, state, wantState) |
dzbarsky
reviewed
Jul 22, 2017
clientconn.go
Outdated
| // connectivityStateEvaluator gets updated by addrConns when their | ||
| // states transition, based on which it evaluates the state of | ||
| // ClientConn. | ||
| // Note: This code will eventually sit in the blanacer in the new design. |
clientconn.go
Outdated
| // recordTransition records state change happening in every addrConn and based on | ||
| // that it evaluates what state the ClientConn is in. | ||
| // It can only transition between Ready, Connecting and TransientFailure. Other states, | ||
| // Idle and Shutdown are transitioned into by ClientConn; in the begining of the conneciton |
There was a problem hiding this comment.
nit: begining, conneciton
| } | ||
|
|
||
| // updateState updates the ConnectivityState of ClientConn. | ||
| // If there's a change it notifies goroutines waiting on state change to |
There was a problem hiding this comment.
it can only notify 1 goroutine, right?
There was a problem hiding this comment.
Although rare, but it's possible multiple goroutines can make a call to WaitForStateChange
clientconn.go
Outdated
| err = cc.resetAddrConn(a, false, nil) | ||
| } | ||
| if err != nil { | ||
| grpclog.Warningf("Error creating conneciton to %v. Err: %v", a, err) |
dfawley
approved these changes
Jul 24, 2017
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
fixes #1208
#1359