Merged
Conversation
The goroutine that logs every 10 seconds can race with the function exiting, which can lead to a data race or even a panic because of t.Log used after the test exits. The fix is to block until the goroutine is exiting, by writing to the unbuffered channel instead of closing it.
kev-cao
approved these changes
Oct 6, 2025
kev-cao
left a comment
kev-cao
left a comment
There was a problem hiding this comment.
LGTM! Thanks for getting the fix out
Member
Author
|
TFTR! |
RaduBerinde
added a commit
to RaduBerinde/cockroach
that referenced
this pull request
Oct 6, 2025
Bump datadriven to incorporate a fix (cockroachdb/datadriven#60). Epic: none Release note: None
RaduBerinde
added a commit
to RaduBerinde/cockroach
that referenced
this pull request
Oct 6, 2025
Bump datadriven to incorporate a fix (cockroachdb/datadriven#60). Epic: none Release note: None
craig bot
pushed a commit
to cockroachdb/cockroach
that referenced
this pull request
Oct 6, 2025
154541: unsafesql: avoid panicking during query formatting r=angles-n-daemons a=angles-n-daemons Part of the effort to guard access to the crdb_internal and system namespaces includes auditing override access (and denied access) to these unsafe internals. Included in this audit is the offending query which attempted to pry into these namespaces. In multiple locations however, this auditing caused the system to panic, for different reasons. In one case, an incorrect number of annotations on the query caused a panic. Another included a plan builder which had no associated statement. We see the process of going from plan -> query as a difficult one, and thus guard this attempt to audit these accesses in a blanket panic catcher, as it's not common that this will happen, and when it does we don't want the system to wholesale fail the query. Fixes: #153590 Epic: CRDB-24527 Release note: none 154740: go.mod: bump Pebble to 0ac45a74e10a r=RaduBerinde a=RaduBerinde Changes: * [`0ac45a74`](cockroachdb/pebble@0ac45a74) metrics: fix TestMetrics flake * [`98c989b1`](cockroachdb/pebble@98c989b1) metamorphic: fix bug in suffix generation when prefix == startPrefix * [`d37d2f4b`](cockroachdb/pebble@d37d2f4b) pebble: materialize virtual tables only if backing contains >= 30% garbage Release note: none. Epic: none. 154867: go.mod: bump datadriven r=RaduBerinde a=RaduBerinde Bump datadriven to incorporate a fix (cockroachdb/datadriven#60). Epic: none Release note: None Co-authored-by: Brian Dillmann <brian.dillmann@cockroachlabs.com> Co-authored-by: Radu Berinde <radu@cockroachlabs.com>
craig bot
pushed a commit
to cockroachdb/cockroach
that referenced
this pull request
Oct 6, 2025
154684: backup: split up the multiregion datadriven test r=jeffswenson a=jeffswenson This splits up the multiregion datadriven test so that each test has at most 2 clusters in it. We've been seeing some stuck server shutdowns and this should make them easier to troubleshoot. Release note: none Informs: #145079 154687: backup: improve datadriven test cleanup r=jeffswenson a=jeffswenson Previously, the datadriven test harness would tear down clusters in order. This makes it difficult to troubleshoot stuck tear downs because there are goroutines for a running server mixed in with goroutines for a server with a stuck shutdown. Release note: none Informs: #145079 154752: sql/schemachanger: fix incorrect filter for pk index swaps r=fqazi a=fqazi Previously, we adjusted the schema changer rules to ensure that old secondary indexes are only dropped when the new secondary index is usable. Unfortunately, one of the rules had an incorrect filter. To address this, this patch fixes the filter to expect the new secondary index, which will have the new flag. Additionally, the index recreation logic for ALTER PRIMARY KEY was delaying when the new secondary indexes could be made public. Fixes: #154751 Release note: None 154867: go.mod: bump datadriven r=RaduBerinde a=RaduBerinde Bump datadriven to incorporate a fix (cockroachdb/datadriven#60). Epic: none Release note: None 154870: changefeedccl: make bulk delivery of rangefeed events optional r=aerfrei a=asg0451 This is a temporary opt-out until we can properly test the performance impact of bulk delivery. Epic: none Release note (general change): The changefeed bulk delivery setting was made optional. Co-authored-by: Jeff Swenson <jeffswenson@betterthannull.com> Co-authored-by: Faizan Qazi <faizan@cockroachlabs.com> Co-authored-by: Radu Berinde <radu@cockroachlabs.com> Co-authored-by: Miles Frankel <miles.frankel@cockroachlabs.com>
RaduBerinde
added a commit
to RaduBerinde/cockroach
that referenced
this pull request
Oct 7, 2025
Bump datadriven to incorporate a fix (cockroachdb/datadriven#60). Epic: none Release note: None
craig bot
pushed a commit
to cockroachdb/cockroach
that referenced
this pull request
Oct 7, 2025
154867: go.mod: bump datadriven r=RaduBerinde a=RaduBerinde Bump datadriven to incorporate a fix (cockroachdb/datadriven#60). Epic: none Release note: None Co-authored-by: Radu Berinde <radu@cockroachlabs.com>
kev-cao
pushed a commit
to kev-cao/cockroach
that referenced
this pull request
Oct 7, 2025
Bump datadriven to incorporate a fix (cockroachdb/datadriven#60). Epic: none Release note: None
kev-cao
pushed a commit
to kev-cao/cockroach
that referenced
this pull request
Oct 14, 2025
Bump datadriven to incorporate a fix (cockroachdb/datadriven#60). Epic: none Release note: None
kev-cao
pushed a commit
to kev-cao/cockroach
that referenced
this pull request
Oct 14, 2025
Bump datadriven to incorporate a fix (cockroachdb/datadriven#60). Epic: none Release note: None
kev-cao
pushed a commit
to kev-cao/cockroach
that referenced
this pull request
Oct 14, 2025
Bump datadriven to incorporate a fix (cockroachdb/datadriven#60). Epic: none Release note: None
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The goroutine that logs every 10 seconds can race with the function exiting, which can lead to a data race or even a panic because of t.Log used after the test exits.
The fix is to block until the goroutine is exiting, by writing to the unbuffered channel instead of closing it.
I reproduced and verified the fix, but it required temporary code changes and the test is too slow to check in.
This change is