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-24.3: row: mark an error from streamer as StorageError #136060

Open
wants to merge 1 commit into
base: release-24.3
Choose a base branch
from

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Nov 23, 2024

Backport 1/1 commits from #135859 on behalf of @yuzefovich.

/cc @cockroachdb/release


Earlier this year we changed the vectorized panic-catcher, namely, we now check a few special error types (like StorageError, notInternalError, and internalError upfront - to avoid more expensive stack-based checks). If we find an internalError and it doesn't have a PG code and doesn't have StorageError or notInternalError in the causes, we now always mark the error as assertion failure. This made it so that we started receiving more sentry reports than previously; in particular, whenever we're using the streamer API, we could now get stop.ErrUnavailable via the following sequence of calls ColIndexJoin.Next -> cFetcher.StartScan -> txnKVStreamer.SetupNextFetch -> Streamer.Enqueue, and this would trigger a sentry report. This commit fixes this by marking an error coming from Streamer.Enqueue as StorageError which will by-pass the logic in the panic-catcher.

Fixes: #128649.

Release note: None


Release justification: low-risk bug fix.

Earlier this year we changed the vectorized panic-catcher, namely, we
now check a few special error types (like `StorageError`,
`notInternalError`, and `internalError` upfront - to avoid more
expensive stack-based checks). If we find an `internalError` _and_ it
doesn't have a PG code and doesn't have `StorageError` or
`notInternalError` in the causes, we now always mark the error as
assertion failure. This made it so that we started receiving more sentry
reports than previously; in particular, whenever we're using the
streamer API, we could now get `stop.ErrUnavailable` via the following
sequence of calls `ColIndexJoin.Next` -> `cFetcher.StartScan` ->
`txnKVStreamer.SetupNextFetch` -> `Streamer.Enqueue`, and this would
trigger a sentry report. This commit fixes this by marking an error
coming from `Streamer.Enqueue` as `StorageError` which will by-pass the
logic in the panic-catcher.

Release note: None
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-24.3-135859 branch from 52cab62 to dc318bb Compare November 23, 2024 00:51
@blathers-crl blathers-crl bot requested a review from a team as a code owner November 23, 2024 00:51
@blathers-crl blathers-crl bot requested review from mgartner and removed request for a team November 23, 2024 00:51
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Nov 23, 2024
Copy link
Author

blathers-crl bot commented Nov 23, 2024

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Backports should only be created for serious
    issues
    or test-only changes.
  • Backports should not break backwards-compatibility.
  • Backports should change as little code as possible.
  • Backports should not change on-disk formats or node communication protocols.
  • Backports should not add new functionality (except as defined
    here).
  • Backports must not add, edit, or otherwise modify cluster versions; or add version gates.
  • All backports must be reviewed by the owning areas TL. For more information as to how that review should be conducted, please consult the backport
    policy
    .
If your backport adds new functionality, please ensure that the following additional criteria are satisfied:
  • 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. State changes must be further protected such that nodes running old binaries will not be negatively impacted by the new state (with a mixed version test added).
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.
  • Your backport must be accompanied by a post to the appropriate Slack
    channel (#db-backports-point-releases or #db-backports-XX-X-release) for awareness and discussion.

Also, please add a brief release justification to the body of your PR to justify this
backport.

@blathers-crl blathers-crl bot requested a review from michae2 November 23, 2024 00:51
@blathers-crl blathers-crl bot added the backport Label PR's that are backports to older release branches label Nov 23, 2024
Copy link
Author

blathers-crl bot commented Nov 23, 2024

It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR?

🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

@cockroach-teamcity
Copy link
Member

This change is Reviewable

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Label PR's that are backports to older release branches 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.

2 participants