Merge pull request #937 from pg-sharding/hufedw

Add Ignore_cancel param to router
pg-sharding · Jan 14, 2025 · 98bfe71 · 98bfe71
2 parents 2849ac5 + 1b6bb77
commit 98bfe71
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/pkg/config/router.go b/pkg/config/router.go
@@ -87,6 +87,8 @@ type Router struct {
 
 	WithCoordinator bool `json:"with_coordinator" toml:"with_coordinator" yaml:"with_coordinator"`
 
+	IgnoreCancel bool `json:"ignore_cancel" toml:"ignore_cancel" yaml:"ignore_cancel"`
+
 	UseSystemdNotifier   bool `json:"use_systemd_notifier" toml:"use_systemd_notifier" yaml:"use_systemd_notifier"`
 	SystemdNotifierDebug bool `json:"systemd_notifier_debug" toml:"systemd_notifier_debug" yaml:"systemd_notifier_debug"`
 }

diff --git a/router/client/client.go b/router/client/client.go
@@ -690,7 +690,7 @@ func (cl *PsqlClient) Init(tlsconfig *tls.Config) error {
 
 		protoVer := binary.BigEndian.Uint32(msg)
 
-		spqrlog.Zero.Debug().
+		spqrlog.Zero.Info().
 			Uint("client", cl.ID()).
 			Uint32("proto-version", protoVer).
 			Msg("received protocol version")
@@ -706,6 +706,9 @@ func (cl *PsqlClient) Init(tlsconfig *tls.Config) error {
 			continue
 
 		case conn.SSLREQ:
+			if config.RouterConfig().IgnoreCancel {
+				return nil
+			}
 			if tlsconfig == nil {
 				_, err := cl.conn.Write([]byte{'N'})
 				if err != nil {