Skip to content

Revert "util/log: more misc cleanups"#57178

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
irfansharif:201126.deflake-logger-race
Nov 26, 2020
Merged

Revert "util/log: more misc cleanups"#57178
craig[bot] merged 1 commit intocockroachdb:masterfrom
irfansharif:201126.deflake-logger-race

Conversation

@irfansharif
Copy link
Copy Markdown
Contributor

This reverts #57000, which introduced a race to crdb. Was able to
reproduce it using

make stressrace PKG=./pkg/sql/pgwire TESTS=TestConnResultsBufferSize

The buggy commit in question appears to be ffd7f68.
Touches #57162 and #57161.

Release note: None

This reverts cockroachdb#57000, which introduced a race to crdb. Was able to
reproduce it using

  make stressrace PKG=./pkg/sql/pgwire TESTS=TestConnResultsBufferSize

The buggy commit in question appears to be ffd7f68.

Release note: None
@irfansharif irfansharif requested review from a team and knz November 26, 2020 15:53
@irfansharif irfansharif requested a review from a team as a code owner November 26, 2020 15:53
@irfansharif irfansharif requested review from dt and removed request for a team November 26, 2020 15:53
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@adityamaru adityamaru self-requested a review November 26, 2020 15:53
@irfansharif
Copy link
Copy Markdown
Contributor Author

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Nov 26, 2020

Build succeeded:

@craig craig bot merged commit 87cf74e into cockroachdb:master Nov 26, 2020
@irfansharif irfansharif deleted the 201126.deflake-logger-race branch November 26, 2020 17:09
craig bot pushed a commit that referenced this pull request Nov 30, 2020
56395: sqlsmith: add schema-related operations r=jordanlewis a=jordanlewis

User-defined schemas are now supported in sqlsmith. UDSs will be
randomly generated, and new tables will be randomly included in the
available UDSs. Queries will select from any table, including those
inside of UDSs as well.

Closes #54961.

Release note: None

57222: Revert "Revert "util/log: more misc cleanups"" r=irfansharif a=knz

Reverts  #57178. 

This re-instates #57000, as it did not "introduce a race in crdb"
The description in #57178 was incorrect - instead #57161 / #57162 merely outlined a bug in some tests, which remains to be fixed.

This PR also includes a temporary workaround for said test bug.

Fixes #57162. 
Fixes #57161 (presumably - although the symptoms there don't align).



Co-authored-by: Jordan Lewis <jordanthelewis@gmail.com>
Co-authored-by: Raphael 'kena' Poss <knz@thaumogen.net>
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.

4 participants