/cockroach

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.

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

sql: fix flaky TestShowQueries #31241

Merged
merged 1 commit into from Oct 11, 2018

Conversation

Reviewers

@knz knz

@cockroachdb/sql-execution-prs sql-execution-prs

@cockroachdb/sql-planning-prs sql-planning-prs

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@jordanlewis @cockroach-teamcity @knz
@jordanlewis
Member

jordanlewis commented Oct 11, 2018

There was a potential data race, and an incorrect check for a common
query (it's SHOW CLUSTER SETTING version, not capital VERSION).

Closes #29628.

Release note: None

@jordanlewis jordanlewis requested review from cockroachdb/sql-execution-prs as code owners Oct 11, 2018

@cockroach-teamcity

This comment has been minimized.

Show comment
Hide comment
@cockroach-teamcity

cockroach-teamcity Oct 11, 2018

Member

This change is Reviewable
Member

cockroach-teamcity commented Oct 11, 2018

This change is Reviewable
@jordanlewis
sql: fix flaky TestShowQueries 
There was a potential data race, and an incorrect check for a common
query (it's SHOW CLUSTER SETTING version, not capital VERSION).

Release note: None
Verified
This commit was signed with a verified signature.
@jordanlewis jordanlewis Jordan Lewis
GPG key ID: CB92F5D43A08059A Learn about signing commits
Loading status checks…
32c8f16

@jordanlewis jordanlewis requested a review from knz Oct 11, 2018

@knz

knz approved these changes Oct 11, 2018
View changes

thank you

@jordanlewis

This comment has been minimized.

Show comment
Hide comment
@jordanlewis

jordanlewis Oct 11, 2018

Member

bors r+
Member

jordanlewis commented Oct 11, 2018

bors r+

craig bot pushed a commit that referenced this pull request Oct 11, 2018

craig[bot] @jordanlewis
Merge #31241 
31241: sql: fix flaky TestShowQueries r=jordanlewis a=jordanlewis

There was a potential data race, and an incorrect check for a common
query (it's SHOW CLUSTER SETTING version, not capital VERSION).

Closes #29628.

Release note: None

Co-authored-by: Jordan Lewis <jordanthelewis@gmail.com>
Loading status checks…
7a31690
@craig

This comment has been minimized.

Show comment
Hide comment
@craig

craig bot Oct 11, 2018

Build succeeded

craig bot commented Oct 11, 2018

Build succeeded

@craig craig bot merged commit 32c8f16 into cockroachdb:master Oct 11, 2018
3 checks passed

3 checks passed

GitHub CI (Cockroach) TeamCity build finished
Details
bors Build succeeded
Details
license/cla Contributor License Agreement is signed.
Details

@jordanlewis jordanlewis deleted the jordanlewis:fix-show-queries branch Oct 12, 2018

@knz

This comment has been minimized.

Show comment
Hide comment
@knz

knz Oct 12, 2018

Member

this wants a backport
Member

knz commented Oct 12, 2018

this wants a backport

@jordanlewis jordanlewis referenced this pull request Oct 12, 2018

Merged

backport-2.1: sql: better memory accounting in windower; fix flaky TestShowQueries #31302

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment