Skip to content

backupccl: deflake memory monitor restore test#108942

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
rhu713:mem-mon-test-flake
Aug 21, 2023
Merged

backupccl: deflake memory monitor restore test#108942
craig[bot] merged 1 commit intocockroachdb:masterfrom
rhu713:mem-mon-test-flake

Conversation

@rhu713
Copy link
Copy Markdown
Contributor

@rhu713 rhu713 commented Aug 17, 2023

Deflake the TestRestoreMemoryMonitoring tests by only asserting the lower bound in the number of files produced in the backup to account for elastic CPU limiter.

Fixes: #108239

Release note: None

@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@rhu713 rhu713 marked this pull request as ready for review August 17, 2023 21:20
@rhu713 rhu713 requested a review from a team as a code owner August 17, 2023 21:20
@rhu713 rhu713 requested review from msbutler and removed request for a team August 17, 2023 21:20
@rhu713 rhu713 added backport-22.2.x backport-23.1.x PAST MAINTENANCE SUPPORT: 23.1 patch releases via ER request only labels Aug 17, 2023
@dt
Copy link
Copy Markdown
Contributor

dt commented Aug 18, 2023

What coverage would we lose if we just did >= expected, rather than having the 5% overage upper bound on what we allow? Just thinking a really slow/overloaded CI could see lots of elastic resumes

Deflake the TestRestoreMemoryMonitoring tests by only asserting the lower bound
in the number of files produced in the backup to account for elastic CPU
limiter.

Fixes: cockroachdb#108239

Release note: None
@rhu713 rhu713 force-pushed the mem-mon-test-flake branch from eaeab16 to 149ad11 Compare August 18, 2023 17:18
@rhu713
Copy link
Copy Markdown
Contributor Author

rhu713 commented Aug 18, 2023

What coverage would we lose if we just did >= expected

I don't think we really lose any coverage. I updated the test so that we just assert the lower bound.

@rhu713
Copy link
Copy Markdown
Contributor Author

rhu713 commented Aug 21, 2023

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Aug 21, 2023

Build succeeded:

@craig craig bot merged commit 2ac44e6 into cockroachdb:master Aug 21, 2023
@blathers-crl
Copy link
Copy Markdown

blathers-crl bot commented Aug 21, 2023

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 149ad11 to blathers/backport-release-22.2-108942: 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 22.2.x failed. See errors above.


error creating merge commit from 149ad11 to blathers/backport-release-23.1-108942: 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.1.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

Labels

backport-23.1.x PAST MAINTENANCE SUPPORT: 23.1 patch releases via ER request only

Projects

None yet

Development

Successfully merging this pull request may close these issues.

ccl/backupccl: TestRestoreMemoryMonitoring_splits_200_inc_3_procMaxFiles_5 failed

4 participants