storage: don't crash when applying ChangeReplicas trigger with DeprecatedNextReplicaID#41148
Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom Sep 27, 2019
Merged
Conversation
Member
|
This change is |
bdarnell
approved these changes
Sep 26, 2019
Contributor
bdarnell
left a comment
There was a problem hiding this comment.
Reviewed 2 of 2 files at r1.
Reviewable status:complete! 0 of 0 LGTMs obtained (waiting on @ajwerner)
ajwerner
approved these changes
Sep 26, 2019
Contributor
ajwerner
left a comment
There was a problem hiding this comment.
Nice test. Thanks for picking this up
Reviewed 1 of 2 files at r1.
Reviewable status:
pkg/storage/replica_application_state_machine.go, line 675 at r1 (raw file):
// providing a new range descriptor directly, which includes this info. var nextReplID roachpb.ReplicaID if change.Desc != nil {
I could see adding a method to the ChangeReplicasTrigger to hide this migration.
…atedNextReplicaID Fixes cockroachdb#41145. This bug was introduced in cockroachdb#40892. This may force us to pick a new SHA for the beta. Any ChangeReplicas Raft entry from 19.1 or before is going to crash a node without it. Release justification: fixes a crash in mixed version clusters. Release note: None
8f9657e to
15f5b81
Compare
nvb
commented
Sep 27, 2019
Contributor
Author
nvb
left a comment
There was a problem hiding this comment.
bors r+
Reviewable status:
pkg/storage/replica_application_state_machine.go, line 675 at r1 (raw file):
Previously, ajwerner wrote…
I could see adding a method to the ChangeReplicasTrigger to hide this migration.
This is only used here, so I think I'd rather call it out where it's needed.
craig bot
pushed a commit
that referenced
this pull request
Sep 27, 2019
41148: storage: don't crash when applying ChangeReplicas trigger with DeprecatedNextReplicaID r=nvanbenschoten a=nvanbenschoten Fixes #41145. This bug was introduced in #40892. This may force us to pick a new SHA for the beta. Any ChangeReplicas Raft entry from 19.1 or before is going to crash a node without it. Release justification: fixes a crash in mixed version clusters. Release note: None Co-authored-by: Nathan VanBenschoten <nvanbenschoten@gmail.com>
Contributor
Build succeeded |
nvb
added a commit
to nvb/cockroach
that referenced
this pull request
Sep 27, 2019
… trigger Fixes cockroachdb#41155. The fix in cockroachdb#41148 avoided a crash when staging a ChangeReplicas trigger with a DeprecatedNextReplicaID in an application batch, but there was another bug where applying the side-effects of such a command still caused a crash. This commit fixes the crash and extends the test added in cockroachdb#41148 to go through the whole process of applying the command (which would have caught the second crash as well). Release justification: fixes a crash in mixed version clusters. Release note: None
craig bot
pushed a commit
that referenced
this pull request
Sep 27, 2019
41171: storage: don't crash when applying side-effects of old ChangeReplicas trigger r=nvanbenschoten a=nvanbenschoten Fixes #41155. Fixes #41147. The fix in #41148 avoided a crash when staging a ChangeReplicas trigger with a DeprecatedNextReplicaID in an application batch, but there was another bug where applying the side-effects of such a command still caused a crash. This commit fixes the crash and extends the test added in #41148 to go through the whole process of applying the command (which would have caught the second crash as well). Release justification: fixes a crash in mixed version clusters. Release note: None Co-authored-by: Nathan VanBenschoten <nvanbenschoten@gmail.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Fixes #41145.
This bug was introduced in #40892.
This may force us to pick a new SHA for the beta. Any ChangeReplicas
Raft entry from 19.1 or before is going to crash a node without it.
Release justification: fixes a crash in mixed version clusters.
Release note: None