Skip to content

sql: deflake TestBackfillWithProtectedTS#141196

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
rafiss:deflake-TestBackfillWithProtectedTS
Feb 18, 2025
Merged

sql: deflake TestBackfillWithProtectedTS#141196
craig[bot] merged 1 commit intocockroachdb:masterfrom
rafiss:deflake-TestBackfillWithProtectedTS

Conversation

@rafiss
Copy link
Copy Markdown
Collaborator

@rafiss rafiss commented Feb 11, 2025

  • Using different tables for each subtest makes the tests more
    isolated from each other.
  • Add a primary key to the table to avoid ever using a secondary index.
  • Delete in batches instead of all at once. This makes the delete
    operation less likely to experience contention.

I verified this deflaked the test by running the test on EngFlow with

./dev test pkg/sql -f=TestBackfillWithProtectedTS --stress --count=10000

fixes #139814
fixes #140043
fixes #139991
fixes #139901
fixes #139862

Release note: None

@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@rafiss rafiss force-pushed the deflake-TestBackfillWithProtectedTS branch 2 times, most recently from 3b42c0a to 3ba5300 Compare February 12, 2025 06:17
- Using different tables for each subtest makes the tests more
isolated from each other.
- Add a primary key to the table to avoid ever using a secondary index.
- Delete in batches instead of all at once. This makes the delete
  operation less likely to experience contention.

I verified this deflaked the test by running the test on EngFlow with
```
./dev test pkg/sql -f=TestBackfillWithProtectedTS --stress --count=10000
```

Release note: None
@rafiss rafiss force-pushed the deflake-TestBackfillWithProtectedTS branch from 3ba5300 to 86f5e32 Compare February 16, 2025 06:54
@rafiss rafiss added backport-23.2.x PAST MAINTENANCE SUPPORT: 23.2 patch releases via ER request only backport-24.1.x Flags PRs that need to be backported to 24.1. backport-24.3.x Flags PRs that need to be backported to 24.3 backport-25.1.x labels Feb 16, 2025
@rafiss rafiss marked this pull request as ready for review February 17, 2025 13:44
@rafiss rafiss requested a review from a team as a code owner February 17, 2025 13:44
Copy link
Copy Markdown
Contributor

@Dedej-Bergin Dedej-Bergin left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained

@rafiss
Copy link
Copy Markdown
Collaborator Author

rafiss commented Feb 18, 2025

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Feb 18, 2025

@blathers-crl
Copy link
Copy Markdown

blathers-crl bot commented Feb 18, 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 #139991: branch-release-23.2, branch-release-24.1, branch-release-24.3, branch-release-25.1.


Issue #139901: branch-release-23.2, branch-release-24.1, branch-release-25.1.


Issue #139862: branch-release-23.2, branch-release-24.1, branch-release-24.3.


Issue #139814: branch-release-23.2, branch-release-24.1, branch-release-24.3, branch-release-25.1.


Issue #140043: branch-release-23.2, branch-release-24.3, branch-release-25.1.


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

@blathers-crl
Copy link
Copy Markdown

blathers-crl bot commented Feb 18, 2025

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 86f5e32 to blathers/backport-release-23.2-141196: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

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

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


error creating merge commit from 86f5e32 to blathers/backport-release-24.1-141196: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

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

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


error creating merge commit from 86f5e32 to blathers/backport-release-24.3-141196: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

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

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


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

@rafiss rafiss removed the backport-23.2.x PAST MAINTENANCE SUPPORT: 23.2 patch releases via ER request only label Feb 18, 2025
@rafiss rafiss deleted the deflake-TestBackfillWithProtectedTS branch February 19, 2025 15:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-24.1.x Flags PRs that need to be backported to 24.1. backport-24.3.x Flags PRs that need to be backported to 24.3 v25.2.0-prerelease

Projects

None yet

3 participants