cockroach icon indicating copy to clipboard operation
cockroach copied to clipboard

release-21.2: sql/tests: TestRandomSyntaxSchemaChangeColumn use a resettable timeout

Open blathers-crl[bot] opened this issue 3 years ago • 2 comments

Backport 1/1 commits from #84358 on behalf of @fqazi.

/cc @cockroachdb/release


fixes https://github.com/cockroachdb/cockroach/issues/65736

Previously, TestRandomSyntaxSchemaChangeColumn had a fixed timeout, which meant that if schema change got stuck behind each other, this timeout may not have been sufficient. Previously, we tried bumping up this timeout, but this is not the most reliable for this test. To address this, this patch introduces the concept of resettable timeouts, which states that the timeout expires only if no other statements are complete within the given timeout (otherwise, its recalculated since the completion of the last statement. To avoid potential starvation there is a limit on the number of resets, which guarantees eventual expiry if a query is always bypassed.

Release note: None


Release justification:

blathers-crl[bot] avatar Aug 11 '22 11:08 blathers-crl[bot]

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[bot] avatar Aug 11 '22 11:08 blathers-crl[bot]

This change is Reviewable

cockroach-teamcity avatar Aug 11 '22 11:08 cockroach-teamcity