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-23.1: multitenant: re-enable TestTenantUpgradeInterlock #99321

Merged
merged 1 commit into from
Mar 23, 2023

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Mar 23, 2023

Backport 1/1 commits from #99216 on behalf of @ajstorm.

/cc @cockroachdb/release


TestTenantUpgradeInterlock was skipped with #99121 because it was timing out regularly. In response to the timeouts however, #98997 was merged to increase the timeout duration for the test (since its run length is proportional to the number of migrations in the release, which has been increasing). Unfortuntely, our wires got crossed and the skip was introduced before the test had a chance to run with the new timeout. #98987 hasn't shown a failure with the new timeout length, so it may be the case that the longer timeout has resolved the problem.

Reenabling the test to see if it has better success under the new timeout length.

Fixes: #98987
Epic: None
Release note: None


Release justification: Testing only change

TestTenantUpgradeInterlock was skipped with #99121 because it was timing out
regularly. In response to the timeouts however, #98997 was merged to increase
the timeout duration for the test (since its run length is proportional to the
number of migrations in the release, which has been increasing). Unfortuntely,
our wires got crossed and the skip was introduced before the test had a chance
to run with the new timeout. #98987 hasn't shown a failure with the new timeout
length, so it may be the case that the longer timeout has resolved the problem.

Reenabling the test to see if it has better success under the new timeout
length.

Fixes: #98987
Epic: None
Release note: None
@blathers-crl blathers-crl bot requested a review from a team as a code owner March 23, 2023 00:10
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.1-99216 branch 2 times, most recently from 1279fa8 to d744249 Compare March 23, 2023 00:10
@blathers-crl blathers-crl bot requested review from adityamaru and knz March 23, 2023 00:10
@blathers-crl
Copy link
Author

blathers-crl bot commented Mar 23, 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 Mar 23, 2023
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@ajstorm ajstorm merged commit 9b43094 into release-23.1 Mar 23, 2023
@ajstorm ajstorm deleted the blathers/backport-release-23.1-99216 branch March 23, 2023 12:43
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