cleanup: remove unused channel ready (#2353)
This commit is contained in:
@ -885,9 +885,6 @@ type addrConn struct {
|
|||||||
|
|
||||||
// Use updateConnectivityState for updating addrConn's connectivity state.
|
// Use updateConnectivityState for updating addrConn's connectivity state.
|
||||||
state connectivity.State
|
state connectivity.State
|
||||||
// ready is closed and becomes nil when a new transport is up or failed
|
|
||||||
// due to timeout.
|
|
||||||
ready chan struct{}
|
|
||||||
|
|
||||||
tearDownErr error // The reason this addrConn is torn down.
|
tearDownErr error // The reason this addrConn is torn down.
|
||||||
|
|
||||||
@ -994,10 +991,6 @@ func (ac *addrConn) resetTransport(resolveNow bool) {
|
|||||||
ac.mu.Unlock()
|
ac.mu.Unlock()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if ac.ready != nil {
|
|
||||||
close(ac.ready)
|
|
||||||
ac.ready = nil
|
|
||||||
}
|
|
||||||
ac.transport = nil
|
ac.transport = nil
|
||||||
|
|
||||||
backoffIdx := ac.backoffIdx
|
backoffIdx := ac.backoffIdx
|
||||||
@ -1194,10 +1187,6 @@ func (ac *addrConn) createTransport(backoffNum int, addr resolver.Address, copts
|
|||||||
ac.cc.handleSubConnStateChange(ac.acbw, ac.state)
|
ac.cc.handleSubConnStateChange(ac.acbw, ac.state)
|
||||||
ac.transport = newTr
|
ac.transport = newTr
|
||||||
ac.curAddr = addr
|
ac.curAddr = addr
|
||||||
if ac.ready != nil {
|
|
||||||
close(ac.ready)
|
|
||||||
ac.ready = nil
|
|
||||||
}
|
|
||||||
|
|
||||||
ac.mu.Unlock()
|
ac.mu.Unlock()
|
||||||
|
|
||||||
@ -1238,10 +1227,6 @@ func (ac *addrConn) nextAddr() error {
|
|||||||
return errConnClosing
|
return errConnClosing
|
||||||
}
|
}
|
||||||
ac.cc.resolveNow(resolver.ResolveNowOption{})
|
ac.cc.resolveNow(resolver.ResolveNowOption{})
|
||||||
if ac.ready != nil {
|
|
||||||
close(ac.ready)
|
|
||||||
ac.ready = nil
|
|
||||||
}
|
|
||||||
backoffDeadline := ac.backoffDeadline
|
backoffDeadline := ac.backoffDeadline
|
||||||
b := ac.resetBackoff
|
b := ac.resetBackoff
|
||||||
ac.mu.Unlock()
|
ac.mu.Unlock()
|
||||||
@ -1319,10 +1304,6 @@ func (ac *addrConn) tearDown(err error) {
|
|||||||
ac.events.Finish()
|
ac.events.Finish()
|
||||||
ac.events = nil
|
ac.events = nil
|
||||||
}
|
}
|
||||||
if ac.ready != nil {
|
|
||||||
close(ac.ready)
|
|
||||||
ac.ready = nil
|
|
||||||
}
|
|
||||||
if channelz.IsOn() {
|
if channelz.IsOn() {
|
||||||
channelz.AddTraceEvent(ac.channelzID, &channelz.TraceEventDesc{
|
channelz.AddTraceEvent(ac.channelzID, &channelz.TraceEventDesc{
|
||||||
Desc: "Subchannel Deleted",
|
Desc: "Subchannel Deleted",
|
||||||
|
Reference in New Issue
Block a user