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: workload/schemachange: address intermittent failures with select stmts #91477

Merged
merged 1 commit into from
Nov 9, 2022

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Nov 8, 2022

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

/cc @cockroachdb/release


Fixes: #91445

Previously, we added logic to detect memory budget, and disk budget errors but those were only when opening a result set. Unfortunately, these errors can also be hit when consuming the rows themselves. To address this, this patch will detect the same errors and ignore them if detected consuming the result set.

Release note: None


Release justification: low risk and addresses test stability issues

@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-22.2-91450 branch from 9c5fcc2 to 5d19640 Compare November 8, 2022 12:02
@blathers-crl
Copy link
Author

blathers-crl bot commented Nov 8, 2022

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 Nov 8, 2022
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Contributor

@ajwerner ajwerner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewed 1 of 1 files at r1, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @herkolategan and @renatolabs)

Fixes: #91445

Previously, we added logic to detect memory budget, and disk budget
errors but those were only when opening a result set. Unfortunately,
these errors can also be hit when consuming the rows themselves.
To address this, this patch will detect the same errors
and ignore them if detected consuming the result set.

Release note: None
@fqazi fqazi force-pushed the blathers/backport-release-22.2-91450 branch from 5d19640 to 9a226bb Compare November 9, 2022 15:05
@fqazi fqazi merged commit fde4a15 into release-22.2 Nov 9, 2022
@fqazi fqazi deleted the blathers/backport-release-22.2-91450 branch November 9, 2022 16:03
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