/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

storage: de-race TestMergeQueue #31341

Merged
merged 1 commit into from Oct 15, 2018
+2 −0

Conversation

Reviewers

@bdarnell bdarnell

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

tschottdorf commented Oct 15, 2018

It was mutating memory passed to the running cluster.

Fixes #31331.

Release note: None
@tschottdorf
storage: de-race TestMergeQueue 
It was mutating memory passed to the running cluster.

Fixes #31331.

Release note: None
Loading status checks…
f04b622

@tschottdorf tschottdorf requested a review from cockroachdb/core-prs as a code owner Oct 15, 2018

@cockroach-teamcity

This comment has been minimized.

Show comment
Hide comment
@cockroach-teamcity

cockroach-teamcity Oct 15, 2018

Member

This change is Reviewable
Member

cockroach-teamcity commented Oct 15, 2018

This change is Reviewable
@tschottdorf

This comment has been minimized.

Show comment
Hide comment
@tschottdorf

tschottdorf Oct 15, 2018

Member

bors r=bdarnell
Member

tschottdorf commented Oct 15, 2018

bors r=bdarnell

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

craig[bot] @tschottdorf
Merge #31341 
31341: storage: de-race TestMergeQueue r=bdarnell a=tschottdorf

It was mutating memory passed to the running cluster.

Fixes #31331.

Release note: None

Co-authored-by: Tobias Schottdorf <tobias.schottdorf@gmail.com>
Loading status checks…
33748ec

@tschottdorf tschottdorf referenced this pull request Oct 15, 2018

Closed

storage: avoid race in TestMergeQueue #31370

@craig

This comment has been minimized.

Show comment
Hide comment
@craig

craig bot Oct 15, 2018

Build failed

craig bot commented Oct 15, 2018

Build failed
@tschottdorf

This comment has been minimized.

Show comment
Hide comment
@tschottdorf

tschottdorf Oct 15, 2018

Member

Flaked on #30483
Member

tschottdorf commented Oct 15, 2018

Flaked on #30483
@tschottdorf

This comment has been minimized.

Show comment
Hide comment
@tschottdorf

tschottdorf Oct 15, 2018

Member

bors r=bdarnell
Member

tschottdorf commented Oct 15, 2018

bors r=bdarnell

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

craig[bot] @tschottdorf
Merge #31341 
31341: storage: de-race TestMergeQueue r=bdarnell a=tschottdorf

It was mutating memory passed to the running cluster.

Fixes #31331.

Release note: None

Co-authored-by: Tobias Schottdorf <tobias.schottdorf@gmail.com>
Loading status checks…
1a8a6eb
@craig

This comment has been minimized.

Show comment
Hide comment
@craig

craig bot Oct 15, 2018

Build succeeded

craig bot commented Oct 15, 2018

Build succeeded

@craig craig bot merged commit f04b622 into cockroachdb:master Oct 15, 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

@tschottdorf tschottdorf deleted the tschottdorf:fix/merge-race branch Oct 15, 2018

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