Skip to content

sqlproxy: fix test flake#67735

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
andy-kimball:flake
Jul 20, 2021
Merged

sqlproxy: fix test flake#67735
craig[bot] merged 1 commit intocockroachdb:masterfrom
andy-kimball:flake

Conversation

@andy-kimball
Copy link
Copy Markdown
Contributor

TestDirectoryConnect is flaking when testing that it has only one connection
to the proxy. This flake happens because it takes time for connection
closure to propagate to the server. The connection from the previous
sub-test is still present. The fix is to use require.Eventually to wait
until the previous connection is torn down.

Fixes #67405

Release note: None

@andy-kimball andy-kimball requested a review from a team as a code owner July 17, 2021 16:30
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

Copy link
Copy Markdown
Contributor

@jaylim-crl jaylim-crl left a comment

Choose a reason for hiding this comment

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

LGTM, but we should remove those generated and pprof files that were checked in.

Reviewed 1 of 25 files at r1.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @chrisseto)

Copy link
Copy Markdown
Contributor

@chrisseto chrisseto left a comment

Choose a reason for hiding this comment

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

:lgtm: Lots of extra files floating around though.

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @andy-kimball)

TestDirectoryConnect is flaking when testing that it has only one connection
to the proxy. This flake happens because it takes time for connection
closure to propagate to the server. The connection from the previous
sub-test is still present. The fix is to use require.Eventually to wait
until the previous connection is torn down.

Fixes cockroachdb#67405

Release note: None
Copy link
Copy Markdown
Contributor

@jaylim-crl jaylim-crl left a comment

Choose a reason for hiding this comment

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

Reviewed 24 of 24 files at r2.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (and 1 stale) (waiting on @andy-kimball)

@andy-kimball
Copy link
Copy Markdown
Contributor Author

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jul 20, 2021

Build succeeded:

@craig craig bot merged commit f89b2a6 into cockroachdb:master Jul 20, 2021
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.

skipped test: TestDirectoryConnect

4 participants