Skip to content

schemachangerccl: limit number of stages tested for MR#155393

Merged
craig[bot] merged 1 commit into
cockroachdb:masterfrom
fqazi:scbackupMR
Oct 15, 2025
Merged

schemachangerccl: limit number of stages tested for MR#155393
craig[bot] merged 1 commit into
cockroachdb:masterfrom
fqazi:scbackupMR

Conversation

@fqazi

@fqazi fqazi commented Oct 14, 2025

Copy link
Copy Markdown
Collaborator

Previously, this test was timing out frequently because of the number of
stages that we were testing causing it to hit the test timeout. This
patch reduces the number of stages tested on MR for declarative schema
changes during backup / restore. This patch also adjusts timeout waiting
for schema changes to allow for stress runs for testing.

Release note: None
Fixes: #154993
Fixes: #155137
Fixes: #154786
Fixes: #152076
Fixes: #155327
Fixes: #154805
Fixes: #155147

@blathers-crl

blathers-crl Bot commented Oct 14, 2025

Copy link
Copy Markdown

It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR?

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

@cockroach-teamcity

Copy link
Copy Markdown
Member

This change is Reviewable

Previously, this test was timing out frequently because of the number of
stages that we were testing causing it to hit the test timeout. This
patch reduces the number of stages tested on MR for declarative schema
changes during backup / restore. This patch also adjusts timeout waiting
for schema changes to allow for stress runs for testing.

Release note: None
Fixes: cockroachdb#154993
Fixes: cockroachdb#155137
Fixes: cockroachdb#154786
Fixes: cockroachdb#152076
Fixes: cockroachdb#155327
Fixes: cockroachdb#154805
Fixes: cockroachdb#155147
@fqazi fqazi added backport-25.3.x Flags PRs that need to be backported to 25.3 backport-25.4.x Flags PRs that need to be backported to 25.4 labels Oct 15, 2025
@fqazi fqazi marked this pull request as ready for review October 15, 2025 17:00
@fqazi fqazi requested a review from a team as a code owner October 15, 2025 17:00
@fqazi

fqazi commented Oct 15, 2025

Copy link
Copy Markdown
Collaborator Author

@rafiss TFTR!

bors r+

@craig

craig Bot commented Oct 15, 2025

Copy link
Copy Markdown
Contributor

@blathers-crl

blathers-crl Bot commented Oct 15, 2025

Copy link
Copy Markdown

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 #155327: branch-release-25.3, branch-release-25.4.


Issue #154805: branch-release-25.3, branch-release-25.4.


Issue #155147: branch-release-25.3, branch-release-25.4.


Issue #154993: branch-release-25.3.


Issue #155137: branch-release-25.3.


Issue #154786: branch-release-25.3, branch-release-25.4.


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

@blathers-crl

blathers-crl Bot commented Oct 15, 2025

Copy link
Copy Markdown

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from d0acab8 to blathers/backport-release-25.3-155393: POST https://api.github.com/repos/fqazi/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 25.3.x failed. See errors above.


🦉 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