Skip to content

fix: skip releasing if tryDeliver succeeds #3624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
moredure wants to merge 1 commit into from
+11 −8
Closed

fix: skip releasing if tryDeliver succeeds #3624

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions internal/pool/pool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,8 +569,9 @@ func (p *ConnPool) queuedNewConn(ctx context.Context) (*Conn, error) {
defer func() {
if err != nil {
if cn := w.cancel(); cn != nil {
p.putIdleConn(ctx, cn)
p.freeTurn()
if p.putIdleConn(ctx, cn) {
p.freeTurn()
}
}
}
}()
Expand All @@ -597,9 +598,10 @@ func (p *ConnPool) queuedNewConn(ctx context.Context) (*Conn, error) {
if cnErr == nil && delivered {
return
} else if cnErr == nil && !delivered {
p.putIdleConn(dialCtx, cn)
p.freeTurn()
freeTurnCalled = true
if p.putIdleConn(dialCtx, cn) {
p.freeTurn()
freeTurnCalled = true
}
} else {
p.freeTurn()
freeTurnCalled = true
Expand All @@ -616,14 +618,14 @@ func (p *ConnPool) queuedNewConn(ctx context.Context) (*Conn, error) {
}
}

func (p *ConnPool) putIdleConn(ctx context.Context, cn *Conn) {
func (p *ConnPool) putIdleConn(_ context.Context, cn *Conn) bool {
for {
w, ok := p.dialsQueue.dequeue()
if !ok {
break
}
if w.tryDeliver(cn, nil) {
return
return false
}
}

Expand All @@ -632,12 +634,13 @@ func (p *ConnPool) putIdleConn(ctx context.Context, cn *Conn) {

if p.closed() {
_ = cn.Close()
return
return true
}

// poolSize is increased in newConn
p.idleConns = append(p.idleConns, cn)
p.idleConnsLen.Add(1)
return true
}

func (p *ConnPool) waitTurn(ctx context.Context) error {
Expand Down
Loading