cli: skip some zip tests under deadlock #159096
Merged
+4
−0
Conversation
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
Resolves: cockroachdb#158973 Resolves: cockroachdb#158375 Resolves: cockroachdb#158467 Resolves: cockroachdb#158437 Epic: None Release note: None
dhartunian
requested review from
alyshanjahani-crl
and removed request for
a team
dhartunian
requested review from
aa-joshi and
arjunmahishi
and removed request for
a team
Member
|
This change is |
aa-joshi
approved these changes
Dec 10, 2025
Contributor
aa-joshi
left a comment
aa-joshi
left a comment
There was a problem hiding this comment.
Reviewable status:
complete! 1 of 0 LGTMs obtained (waiting on @Abhinav1299, @alyshanjahani-crl, and @arjunmahishi)
Collaborator
Author
|
bors r+ |
craig bot
pushed a commit
that referenced
this pull request
Dec 10, 2025
158390: sql: support table storage params change in the declarative schema changer r=rafiss a=shghasemi ### sql: support table storage params change in the declarative schema changer Previously, storage parameters were set and reset using the legacy schema changer. With this change, setting most non-backfilling table storage params will use the declarative schema changer. Setting ttl-related params, schema_locked, and infer_rbr_region_col_using_constraint is not implemented yet. ### schemachanger: handle RESET storage param in declarative schema changer This reuses the logic that was added to handle SET. The only difference is that RESET always drops the StorageParam element. ### schemachanger: handle manual schema_locked setting in declarative This storage parameter is special, so this requires logic to use the pre-existing TableSchemaLocked element rather than the normal storage param element. As part of this, we partially revert bc3f228 and refactor the check to be a little simpler since we don't actually need to handle the mixed version case now. Epic CRDB-31281 Fixes #155990 Release note: None 159075: sqlstats: skip TestSQLStatsDiscardStatsOnFingerprintLimit under race r=dhartunian a=dhartunian Resolves: #158978 Epic: None Release note: None 159096: cli: skip some zip tests under deadlock r=dhartunian a=dhartunian Resolves: #158973 Resolves: #158375 Resolves: #158467 Resolves: #158437 Epic: None Release note: None Co-authored-by: Shadi Ghasemitaheri <shadi.ghasemitaheri@cockroachlabs.com> Co-authored-by: Rafi Shamim <rafi@cockroachlabs.com> Co-authored-by: David Hartunian <davidh@cockroachlabs.com>
Contributor
|
This PR was included in a batch that was canceled, it will be automatically retried |
dhartunian
added
the
backport-26.1.x
Contributor
This was referenced Dec 10, 2025
|
Based on the specified backports for this PR, I applied new labels to the following linked issue(s). Please adjust the labels as needed to match the branches actually affected by the issue(s), including adding any known older branches. Issue #158437: branch-release-25.3, branch-release-25.4, branch-release-26.1. Issue #158973: branch-release-25.3, branch-release-26.1. Issue #158375: branch-release-25.4, branch-release-26.1. Issue #158467: branch-release-25.4, branch-release-26.1. 🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf. |
This was referenced Dec 10, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Resolves: #158973
Resolves: #158375
Resolves: #158467
Resolves: #158437
Epic: None
Release note: None