Skip to content
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.

Sign up for GitHub

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

Jump to bottom

release-22.2: de-flake debug zip tests #110991

Merged
merged 2 commits into from
Sep 21, 2023
Merged

release-22.2: de-flake debug zip tests #110991

merged 2 commits into from
Sep 21, 2023

Conversation

abarganier
Copy link
Contributor

@abarganier abarganier commented Sep 20, 2023 •
edited
Loading

Backport:

Please see individual PRs for details.

/cc @cockroachdb/release

Over the past year, work has been done to de-flake debug zip tests.

These tests can have various non-deterministic outputs that were previously not accounted for. Over time to fix this, we've updated the logic that strips non-deterministic output to account for these flaky bits that were causing test flakes.

While these have been fixed on the master branch, older release branches did not receive the changes. This has led to some test flakes on older release branches.

This backport ports over these test changes to the release-22.2 branch to fix some flakes of this nature that came up.

Fixes: #110164

Release justification: low risk, test-only change that doesn't impact user functionality.

@aadityasondhi @abarganier
cli: unskip test tenant zip test
4132436 
This patch unskips and re-records the datadriven `TestTenantZip` as it
was fixed in cockroachdb#96553, but was not unskipped or recorded. The test was run
locally using `--stress` and did not flake:
```
101 runs so far, 0 failures, over 5m0s
```

Fixes cockroachdb#87141

Release note: None
@abarganier abarganier requested a review from a team September 20, 2023 19:15
@abarganier abarganier requested a review from a team as a code owner September 20, 2023 19:15
@blathers-crl
Copy link

blathers-crl bot commented Sep 20, 2023 •
edited by abarganier
Loading

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Patches should only be created for serious issues or test-only changes.
  • Patches should not break backwards-compatibility.
  • Patches should change as little code as possible.
  • Patches should not change on-disk formats or node communication protocols.
  • Patches should not add new functionality.
  • Patches must not add, edit, or otherwise modify cluster versions; or add version gates.
If some of the basic criteria cannot be satisfied, ensure that the exceptional criteria are satisfied within.
  • There is a high priority need for the functionality that cannot wait until the next release and is difficult to address in another way.
  • The new functionality is additive-only and only runs for clusters which have specifically “opted in” to it (e.g. by a cluster setting).
  • New code is protected by a conditional check that is trivial to verify and ensures that it only runs for opt-in clusters.
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.

Add a brief release justification to the body of your PR to justify this backport.

Some other things to consider:

  • What did we do to ensure that a user that doesn’t know & care about this backport, has no idea that it happened?
  • Will this work in a cluster of mixed patch versions? Did we test that?
  • If a user upgrades a patch version, uses this feature, and then downgrades, what happens?

@blathers-crl blathers-crl bot added the backport Label PR's that are backports to older release branches label Sep 20, 2023
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@abarganier abarganier requested review from dhartunian and removed request for a team September 20, 2023 19:20
@knz @abarganier
cli: de-flake the zip tests
37b3ec7 
Goroutine / heap / profile dump generation is non-deterministic.
The reference test output should not include them.

Release note: None
@abarganier abarganier force-pushed the backport22.2-98778-96553 branch from 4c2b110 to 37b3ec7 Compare September 20, 2023 19:48
@abarganier
Copy link
Contributor Author

TFTR!

@abarganier abarganier merged commit 3f76e5b into cockroachdb:release-22.2 Sep 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@knz knz knz approved these changes

@dhartunian dhartunian Awaiting requested review from dhartunian

Assignees
No one assigned
Labels
backport Label PR's that are backports to older release branches
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@abarganier @cockroach-teamcity @knz @aadityasondhi