Skip to content

sqlproxyccl: always close the client connection#58355

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
jbowens:jackson/sqlproxyccl-close
Dec 30, 2020
Merged

sqlproxyccl: always close the client connection#58355
craig[bot] merged 1 commit intocockroachdb:masterfrom
jbowens:jackson/sqlproxyccl-close

Conversation

@jbowens
Copy link
Copy Markdown
Contributor

@jbowens jbowens commented Dec 29, 2020

Previously, the sqlproxy failed to close the incoming TCP connection if
an error occurred in the frontend admitter. This leaked the connection
server-side and left the client connection hanging.

This adds back the deferred close of the incoming TCP connection
(removed in #57306). The custom Conn type allows callers to call Close
multiple times.

Release note: none

@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

Copy link
Copy Markdown
Contributor

@darinpp darinpp left a comment

Choose a reason for hiding this comment

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

Looks good.

Previously, the sqlproxy failed to close the incoming TCP connection if
an error occurred in the frontend admitter. This leaked the connection
server-side and left the client connection hanging.

This adds back the deferred close of the incoming TCP connection
(removed in cockroachdb#57306). The custom Conn type allows callers to call Close
multiple times.

Release note: none
@jbowens jbowens force-pushed the jackson/sqlproxyccl-close branch from 028d1dc to be8c5cf Compare December 30, 2020 15:24
@jbowens
Copy link
Copy Markdown
Contributor Author

jbowens commented Dec 30, 2020

TFTR!

bors r=darinpp

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Dec 30, 2020

Build succeeded:

@craig craig bot merged commit e01dc11 into cockroachdb:master Dec 30, 2020
@jbowens jbowens deleted the jackson/sqlproxyccl-close branch December 30, 2020 17:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants