Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8659 from gyuho/pinned

Browse Source 
clientv3: add pinned() method to 'balancer'
This commit is contained in:
Gyu-Ho Lee 2017-10-06 16:03:14 -07:00 committed by GitHub
commit e8e3467455
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clientv3/balancer.go
View File

@ -42,6 +42,8 @@ type balancer interface {
endpoint(host string) string
endpoints() []string
// pinned returns the current pinned endpoint.
pinned() string
// up is Up but includes whether the balancer will use the connection.
up(addr grpc.Address) (func(error), bool)
@ -142,6 +144,12 @@ func (b *simpleBalancer) endpoints() []string {
return b.eps
}
func (b *simpleBalancer) pinned() string {
b.mu.RLock()
defer b.mu.RUnlock()
return b.pinAddr
}
func getHost2ep(eps []string) map[string]string {
hm := make(map[string]string, len(eps))
for i := range eps {

6
clientv3/retry.go
View File

@ -58,12 +58,13 @@ func (c *Client) newRetryWrapper(isStop retryStopErrFunc) retryRpcFunc {
case <-c.ctx.Done():
return c.ctx.Err()
}
pinned := c.balancer.pinned()
err := f(rpcCtx)
if err == nil {
return nil
}
if logger.V(4) {
logger.Infof("clientv3/retry: retry for error %v", err)
logger.Infof("clientv3/retry: error %v on pinned endpoint %s", err, pinned)
}
notify := c.balancer.ConnectNotify()
if s, ok := status.FromError(err); ok && s.Code() == codes.Unavailable {
@ -86,12 +87,13 @@ func (c *Client) newRetryWrapper(isStop retryStopErrFunc) retryRpcFunc {
func (c *Client) newAuthRetryWrapper() retryRpcFunc {
return func(rpcCtx context.Context, f rpcFunc) error {
for {
pinned := c.balancer.pinned()
err := f(rpcCtx)
if err == nil {
return nil
}
if logger.V(4) {
logger.Infof("clientv3/auth-retry: retry for error %v", err)
logger.Infof("clientv3/auth-retry: error %v on pinned endpoint %s", err, pinned)
}
// always stop retry on etcd errors other than invalid auth token
if rpctypes.Error(err) == rpctypes.ErrInvalidAuthToken {