kvnemesis: fix and unskip TestKVNemesisMultiNode #58919
Merged
Conversation
This file contains 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
Before this patch, cockroachdb#56197 broke this test because it changed a range merge error string that let the KV nemesis validator ignore the error. This patch updates the regexp the validator uses to match the error and unskips the test. Fixes cockroachdb#58624. Release note: None
|
This change is |
tbg
reviewed
Jan 13, 2021
| @@ -310,7 +310,8 @@ func (v *validator) processOp(txnID *string, op Operation) { | |||
| // However, I think the right thing to do is sniff this inside the | |||
| // AdminMerge code and retry so the client never sees it. In the meantime, | |||
| // no-op. #44377 | |||
| } else if resultIsError(t.Result, `merge failed: cannot merge range with non-voter replicas`) { | |||
| } else if resultIsError(t.Result, | |||
| `merge failed: cannot merge ranges when (rhs)|(lhs) is in a joint state or has learners`) { | |||
There was a problem hiding this comment.
By the way, you can address the above TODO now. See *ChangeReplicasOperation below. This error could be marked for IsIllegalReplicationChangeError.
There was a problem hiding this comment.
Noted, I'll make a patch for it.
tbg
approved these changes
Jan 13, 2021
|
TFTR! bors r+ |
|
Build failed (retrying...): |
|
Build succeeded: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Before this patch, #56197 broke this test because it changed a range
merge error string that let the KV nemesis validator ignore the error.
This patch updates the regexp the validator uses to match the error and
unskips the test.
Fixes #58624.
Release note: None