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.

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

release-22.2: backupccl: deflake TestScheduleChainingLifecycle #95635

Merged
merged 1 commit into from
Jan 23, 2023

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Jan 20, 2023

Backport 1/1 commits from #95606 on behalf of @msbutler.

/cc @cockroachdb/release


This patch will skip the test if the machine clock is close to midnight, and increases the frequency of incremental backups to run every 2 minutes.

Previously, the backup schedule in this test used the following crontab recurrence: '*/5 * * * *'. In english, this means "run a full backup now, and then run a full backup every day at midnight, and an incremental every 5 minutes. This test also relies on an incremental backup running after the first full backup. But, what happens if the first full backup gets scheduled to run within 5 minutes of midnight? A second full backup may get scheduled before the expected incremental backup, breaking the invariant the test expects.

Fixes #88575 #95186

Release note: None


Release justification: test only change

@blathers-crl blathers-crl bot requested a review from a team as a code owner January 20, 2023 23:53
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-22.2-95606 branch from 89fba68 to 3b2e902 Compare January 20, 2023 23:53
@blathers-crl blathers-crl bot requested review from benbardin and adityamaru and removed request for a team January 20, 2023 23:53
@blathers-crl
Copy link
Author

blathers-crl bot commented Jan 20, 2023

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 blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Jan 20, 2023
@cockroach-teamcity
Copy link
Member

This change is Reviewable

This patch will skip the test if the machine clock is close to midnight, and
increases the frequency of incremental backups to run every 2 minutes.

Previously, the backup schedule in this test used the following crontab
recurrence: '*/5 * * * *'. In english, this means "run a full backup now, and
then run a full backup every day at midnight, and an incremental every 5
minutes. This test also relies on an incremental backup running after the first
full backup. But, what happens if the first full backup gets scheduled to run
within 5 minutes of midnight? A second full backup may get scheduled before the
expected incremental backup, breaking the invariant the test expects.

Fixes #88575 #95186

Release note: None
@msbutler msbutler force-pushed the blathers/backport-release-22.2-95606 branch from 3b2e902 to 0889484 Compare January 23, 2023 01:51
@msbutler msbutler merged commit b5c16b7 into release-22.2 Jan 23, 2023
@msbutler msbutler deleted the blathers/backport-release-22.2-95606 branch January 23, 2023 15:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants