good morning!!!!

Skip to content
Snippets Groups Projects
Commit fd4d380b authored by Garet Halliday's avatar Garet Halliday
Browse files

fix maybe?

parent b3c53a4a
No related branches found
No related tags found
No related merge requests found
...@@ -292,7 +292,7 @@ func (T *Pool) acquireServer(client *Client) *Server { ...@@ -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 != "" { if T.options.ServerResetQuery != "" {
server.SetState(metrics.ConnStateRunningResetQuery, uuid.Nil) server.SetState(metrics.ConnStateRunningResetQuery, uuid.Nil)
...@@ -308,18 +308,6 @@ func (T *Pool) releaseServerSlow(server *Server) { ...@@ -308,18 +308,6 @@ func (T *Pool) releaseServerSlow(server *Server) {
T.options.Pooler.Release(server.GetID()) 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( func (T *Pool) Serve(
conn fed.Conn, conn fed.Conn,
initialParameters map[strutil.CIString]string, initialParameters map[strutil.CIString]string,
...@@ -371,7 +359,7 @@ func (T *Pool) serve(client *Client, initialized bool) error { ...@@ -371,7 +359,7 @@ func (T *Pool) serve(client *Client, initialized bool) error {
if serverErr != nil { if serverErr != nil {
T.removeServer(server) T.removeServer(server)
} else { } else {
T.releaseServerSlow(server) T.releaseServer(server)
} }
server = nil server = nil
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment