diff --git a/cluster/router/healthcheck/default_health_check.go b/cluster/router/healthcheck/default_health_check.go index c522bdf0f98244f5f8bdfba6085cb45dd89c1004..409408bb942485f71a782f9240e69c82410ab8b9 100644 --- a/cluster/router/healthcheck/default_health_check.go +++ b/cluster/router/healthcheck/default_health_check.go @@ -48,6 +48,10 @@ type DefaultHealthChecker struct { // IsHealthy evaluates the healthy state on the given Invoker based on the number of successive bad request // and the current active request func (c *DefaultHealthChecker) IsHealthy(invoker protocol.Invoker) bool { + if !invoker.IsAvailable() { + return false + } + urlStatus := protocol.GetURLStatus(invoker.GetUrl()) if c.isCircuitBreakerTripped(urlStatus) || urlStatus.GetActive() > c.GetOutStandingRequestCountLimit() { logger.Debugf("Invoker [%s] is currently in circuitbreaker tripped state", invoker.GetUrl().Key()) diff --git a/protocol/dubbo/dubbo_invoker.go b/protocol/dubbo/dubbo_invoker.go index bce33508bec92b706a1722c3bbc0ed0607e66643..e72ca28299727d9865664036016671670f5935a0 100644 --- a/protocol/dubbo/dubbo_invoker.go +++ b/protocol/dubbo/dubbo_invoker.go @@ -161,6 +161,10 @@ func (di *DubboInvoker) getTimeout(invocation *invocation_impl.RPCInvocation) ti return di.timeout } +func (di *DubboInvoker) IsAvailable() bool { + return di.client.IsAvailable() +} + // Destroy destroy dubbo client invoker. func (di *DubboInvoker) Destroy() { di.quitOnce.Do(func() { diff --git a/remoting/exchange_client.go b/remoting/exchange_client.go index efcfca55868e7042b685adb5fb2452dd2d3a65c0..e5f6d7febbaf305fe5971b13b0966fdc1dc53f03 100644 --- a/remoting/exchange_client.go +++ b/remoting/exchange_client.go @@ -47,6 +47,8 @@ type Client interface { Close() // send request to server. Request(request *Request, timeout time.Duration, response *PendingResponse) error + // check if the client is still available + IsAvailable() bool } // This is abstraction level. it is like facade. @@ -182,6 +184,11 @@ func (client *ExchangeClient) Close() { client.client.Close() } +// IsAvailable to check if the underlying network client is available yet. +func (client *ExchangeClient) IsAvailable() bool { + return client.client.IsAvailable() +} + // handle the response from server func (client *ExchangeClient) Handler(response *Response) { diff --git a/remoting/getty/getty_client.go b/remoting/getty/getty_client.go index 6af3971f5c1f9ff5b0fafbc00ae2ba3f44eb34b5..7edc1cf8c59f86a3f89c623b4ed02b6b0a0495ec 100644 --- a/remoting/getty/getty_client.go +++ b/remoting/getty/getty_client.go @@ -204,6 +204,14 @@ func (c *Client) Request(request *remoting.Request, timeout time.Duration, respo return perrors.WithStack(err) } +// isAvailable returns true if the connection is available, or it can be re-established. +func (c *Client) IsAvailable() bool { + client, _, err := c.selectSession(c.addr) + return err == nil && + // defensive check + client != nil +} + func (c *Client) selectSession(addr string) (*gettyRPCClient, getty.Session, error) { rpcClient, err := c.pool.getGettyRpcClient(addr) if err != nil {