fix PR issues

Author: asmyasnikov

CHANGELOG.md

@@ -1,7 +1,7 @@
 * Added `conn.Ping(ctx)` method for check availability of `conn.Conn`
-* Refactored `cluster.Cluster.Get(ctx)` for return only available connection (instead return any connection from balancer)
-* Added address to error description which thrown from `conn.take()`
-* Renamed package `internal/db` to `internal/database` for exclude collisions with variable name `db`
+* Refactored `cluster.Cluster.Get(ctx)` to return only available connection (instead of returning any connection from balancer)
+* Added address to error description thrown from `conn.take()`
+* Renamed package `internal/db` to `internal/database` to exclude collisions with variable name `db`
 
 ## v3.18.0
 * Added `go1.18` to test matrix

internal/conn/conn.go

@@ -228,7 +228,7 @@ func (c *conn) take(ctx context.Context) (cc *grpc.ClientConn, err error) {
 
 	cc, err = grpc.DialContext(ctx, address, c.config.GrpcDialOptions()...)
 	if err != nil {
-		return nil, errors.WithStackTrace(fmt.Errorf("%w: %s", err, address))
+		return nil, errors.WithStackTrace(fmt.Errorf("dial %s failed: %w", address, err))
 	}
 
 	c.cc = cc
@@ -286,11 +286,7 @@ func isBroken(raw *grpc.ClientConn) bool {
 }
 
 func isAvailable(raw *grpc.ClientConn) bool {
-	if raw == nil {
-		return false
-	}
-	s := raw.GetState()
-	return s == connectivity.Ready
+	return raw != nil && raw.GetState() == connectivity.Ready
 }
 
 // conn must be locked