Skip to content

roachtest: mark cluster as expected to die in validate_system_schema_after_version_upgrade #149353

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

Merged
merged 2 commits into from
Jul 1, 2025

Conversation

rafiss
Copy link
Collaborator

@rafiss rafiss commented Jul 1, 2025

Before wiping the cluster, we need to indicate to the test that the
cluster is going to go down. This is needed after
eae1e78.

fixes #148981
fixes #148998

Release note: None

rafiss added 2 commits July 1, 2025 10:59
The V25_3_AddHotRangeLoggerJob cluster version comes _after_ the
V25_3_AddEstimatedLastLoginTime version. Yet, the corresponding upgrade
for adding the hot ranges logger was incorrectly being done _before_ the
last login time column.

Release note: None
…after_version_upgrade

Before wiping the cluster, we need to indicate to the test that the
cluster is going to go down. This is needed after
eae1e78.

Release note: None
@rafiss
Copy link
Collaborator Author

rafiss commented Jul 1, 2025

@rafiss rafiss marked this pull request as ready for review July 1, 2025 19:37
@rafiss rafiss requested review from a team as code owners July 1, 2025 19:37
@rafiss rafiss requested review from herkolategan and DarrylWong July 1, 2025 19:37
Copy link
Contributor

@DarrylWong DarrylWong left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I missed the fact that wiping all the system tenants would cause the SQL pods to die as well. Sorry for the noise and thanks for fixing!

@@ -134,7 +134,13 @@ func validateSystemSchemaAfterUpgradeTest(
mvt.Run()

// Start a cluster with the latest binary and get the system schema
// from the cluster.
// from the cluster. Mark all processes as expected to die before wiping.
t.Monitor().ExpectProcessDead(c.All())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

c.Wipe already calls c.t.Monitor().ExpectProcessDead(selectedNodesOrDefault(nodes, c.All())) so this should be unnecessary. No harm in calling it again but more curious if you ran into any issues without this line as that would indicate a bug.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line wasn't needed; but I thought it would be more clear to include it as long as we needed to explicitly do this for virtual clusters.

@rafiss
Copy link
Collaborator Author

rafiss commented Jul 1, 2025

tftr!

bors r+

craig bot pushed a commit that referenced this pull request Jul 1, 2025
148967: roachtest: add fingerprint validation to classic restore roachtests r=jeffswenson a=kev-cao

With the switch to the new fixtures in #146555, we temporarily removed fingerprint validation. This commit teaches the restore roachtests to fingerprint after restore, validating the results against the fingerprints stored in the fixtures (introduced in #147662.

Epic: CRDB-50823

Fixes: #148962

Release note: None

149265: roachtest: follower-reads/mixed-version handle schema_locked r=rafiss a=fqazi

Previously, we unconditionally attempted to toggle schema_locked in the follower read mixed versions tests, which would fail since versions before 25.3 do not support the new create_table_withschema_locked setting. This patch updates the test to only toggle this setting if the active version for the cluster is 25.3 or greater.

Fixes: #149150

Release note: None

149353: roachtest: mark cluster as expected to die in validate_system_schema_after_version_upgrade r=rafiss a=rafiss

Before wiping the cluster, we need to indicate to the test that the
cluster is going to go down. This is needed after
eae1e78.

fixes #148981
fixes #148998

Release note: None

Co-authored-by: Kevin Cao <kevin.cao@cockroachlabs.com>
Co-authored-by: Faizan Qazi <faizan@cockroachlabs.com>
Co-authored-by: Rafi Shamim <rafi@cockroachlabs.com>
@craig
Copy link
Contributor

craig bot commented Jul 1, 2025

This PR was included in a batch that successfully built, but then failed to merge into master (it was a non-fast-forward update). It will be automatically retried.

@craig
Copy link
Contributor

craig bot commented Jul 1, 2025

@craig craig bot merged commit 77e13d8 into cockroachdb:master Jul 1, 2025
22 checks passed
Copy link

blathers-crl bot commented Jul 1, 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 #148981: branch-release-25.3.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants