Skip to content

rpc: avoid closing already closed DRPC connection #154851

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

rpc: avoid closing already closed DRPC connection #154851

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
9 changes: 7 additions & 2 deletions pkg/rpc/drpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,13 @@ type closeEntirePoolConn struct {
}

func (c *closeEntirePoolConn) Close() error {
_ = c.Conn.Close()
return c.pool.Close()
select {
case <-c.Conn.Closed():
return nil // already closed
default:
_ = c.Conn.Close()
return c.pool.Close()
}
Comment on lines +141 to +147
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does Close() need to be concurrency safe?

}

type DRPCConnection = Connection[drpc.Conn]
Expand Down