From fd4d380bf57975783ee66bb7bb565d82635f4727 Mon Sep 17 00:00:00 2001
From: Garet Halliday <me@garet.holiday>
Date: Sat, 16 Sep 2023 03:25:08 -0500
Subject: [PATCH] fix maybe?
---
lib/gat/pool/pool.go | 16 ++--------------
1 file changed, 2 insertions(+), 14 deletions(-)
diff --git a/lib/gat/pool/pool.go b/lib/gat/pool/pool.go
index f5223b2d..01d7f140 100644
--- a/lib/gat/pool/pool.go
+++ b/lib/gat/pool/pool.go
@@ -292,7 +292,7 @@ func (T *Pool) acquireServer(client *Client) *Server {
}
}
-func (T *Pool) releaseServerSlow(server *Server) {
+func (T *Pool) releaseServer(server *Server) {
if T.options.ServerResetQuery != "" {
server.SetState(metrics.ConnStateRunningResetQuery, uuid.Nil)
@@ -308,18 +308,6 @@ func (T *Pool) releaseServerSlow(server *Server) {
T.options.Pooler.Release(server.GetID())
}
-func (T *Pool) releaseServer(server *Server) {
- if T.options.ServerResetQuery != "" {
- // we will have to query server, fallback to slow path
- go T.releaseServerSlow(server)
- return
- }
-
- server.SetState(metrics.ConnStateIdle, uuid.Nil)
-
- T.options.Pooler.Release(server.GetID())
-}
-
func (T *Pool) Serve(
conn fed.Conn,
initialParameters map[strutil.CIString]string,
@@ -371,7 +359,7 @@ func (T *Pool) serve(client *Client, initialized bool) error {
if serverErr != nil {
T.removeServer(server)
} else {
- T.releaseServerSlow(server)
+ T.releaseServer(server)
}
server = nil
}
--
GitLab