Merge pull request #1833 from dcherednik/disable_optimistic_unban

Disable optimistic unban nodes after pessimization

Author: qrort

CHANGELOG.md

@@ -1,3 +1,4 @@
+* Added experimental config.WithDisableOptimisticUnban to disable fast node unban after pessimization
 * Fixed respect start offset from topicoptions.WithReaderGetPartitionStartOffset for commit messages
 * Added `query.AllowImplicitSessions()` option for execute queries through `query.Client.{Exec,Query,QueryResultSet,QueryRow}` without explicit sessions
 

config/config.go

@@ -35,6 +35,7 @@ type Config struct {
 	meta               *meta.Meta
 
 	excludeGRPCCodesForPessimization []grpcCodes.Code
+	disableOptimisticUnban           bool
 }
 
 func (c *Config) Credentials() credentials.Credentials {
@@ -46,6 +47,10 @@ func (c *Config) ExcludeGRPCCodesForPessimization() []grpcCodes.Code {
 	return c.excludeGRPCCodesForPessimization
 }
 
+func (c *Config) DisableOptimisticUnban() bool {
+	return c.disableOptimisticUnban
+}
+
 // GrpcDialOptions reports about used grpc dialing options
 func (c *Config) GrpcDialOptions() []grpc.DialOption {
 	return append(
@@ -306,6 +311,16 @@ func ExcludeGRPCCodesForPessimization(codes ...grpcCodes.Code) Option {
 	}
 }
 
+// WithDisableOptimisticUnban disables optimistic unban of nodes after a successful call
+// immediately following pessimization.
+//
+// Experimental: https://github.com/ydb-platform/ydb-go-sdk/blob/master/VERSIONING.md#experimental
+func WithDisableOptimisticUnban() Option {
+	return func(c *Config) {
+		c.disableOptimisticUnban = true
+	}
+}
+
 func New(opts ...Option) *Config {
 	c := defaultConfig()
 

internal/balancer/balancer.go

@@ -372,7 +372,7 @@ func (b *Balancer) wrapCall(ctx context.Context, f func(ctx context.Context, cc
 
 	defer func() {
 		if err == nil {
-			if cc.GetState() == conn.Banned {
+			if !b.driverConfig.DisableOptimisticUnban() && cc.GetState() == conn.Banned {
 				b.pool.Allow(ctx, cc)
 			}
 		} else if conn.IsBadConn(err, b.driverConfig.ExcludeGRPCCodesForPessimization()...) {