release-26.1: kvserver: fix flaky TestReplicaCircuitBreaker_ResolveIntent_QuorumLoss #160611
+24
−3
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The test was failing because selectBestError in dist_sender.go can "flatten" an AmbiguousResultError by formatting it as a string via NewAmbiguousResultErrorf, which loses the error markers (ErrBreakerOpen and ReplicaUnavailableError types). This change makes IsBreakerOpen fall back to string matching when the error is an AmbiguousResultError containing "replica unavailable" text, which is the distinctive marker from the stringified ReplicaUnavailableError. A TODO comment is added suggesting the proper production fix would be to change selectBestError to wrap errors properly instead of formatting them as strings. Fixes cockroachdb#159582 Release note: None
blathers-crl
bot
added
blathers-backport
|
Thanks for opening a backport. Before merging, please confirm that the change does not break backwards compatibility and otherwise complies with the backport policy. Include a brief release justification in the PR description explaining why the backport is appropriate. All backports must be reviewed by the TL for the owning area. While the stricter LTS policy does not yet apply, please exercise judgment and consider gating non-critical changes behind a disabled-by-default feature flag when appropriate. |
blathers-crl
bot
added
backport
Member
|
This change is |
blathers-crl
bot
added
the
backport-test-only
![blathers-crl[bot]](https://avatars.githubusercontent.com/in/59700?s=60&v=4){kind=small}
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport 1/1 commits from #159888 on behalf of @tbg.
The test was failing because
selectBestErrorin dist_sender.go can "flatten" anAmbiguousResultErrorby formatting it as a string viaNewAmbiguousResultErrorf, which loses the error markers (ErrBreakerOpenandReplicaUnavailableErrortypes).This change makes
IsBreakerOpenfall back to string matching when the error is anAmbiguousResultErrorcontaining "replica unavailable" text, which is the distinctive marker from the stringifiedReplicaUnavailableError.A TODO comment is added suggesting the proper production fix would be to change
selectBestErrorto wrap errors properly instead of formatting them as strings.Fixes #159582
Release note: None
Release justification: fixes a flake.