Revert "kv,migration: rm code handling legacy raft truncated state"#70432
Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom Sep 20, 2021
Merged
Conversation
Member
|
This change is |
Member
|
LGTM Clean revert? I didn't look much at the diff under that assumption. If anything required manual changes please let me know and I'll give those parts a closer look. Also, looking forward to reverting the revert. :-) |
Contributor
Author
|
Yup, save for some code movements around cockroach_versions.go. Can I get a green stamp pls? |
ajwerner
approved these changes
Sep 20, 2021
Contributor
ajwerner
left a comment
There was a problem hiding this comment.
Stamped on green assuming it's just mechanical.
This reverts commit 6464de2. That PR broke few of our roachtests since we haven't release the 21.2 beta yet. For our roachtests that exercised the upgrade path, we were effectively upgrading from 21.1 to 22.1 code (as of that PR) that asserted on the completion of the long running migration removing the legacy raft truncated state -- something that would only happen when going through 21.2. Given that, we temporarily revert cockroachdb#69887 while our beta gets prepared. cockroachdb#69887 (or rather, the revert of this commit) will be re-introduced to master once cockroachdb#69826 lands. Fixes cockroachdb#70244. Fixes cockroachdb#70252. Fixes cockroachdb#70253. Fixes cockroachdb#70283. Fixes cockroachdb#70350. Fixes cockroachdb#70390. Release note: None
22cf7b8 to
ef1dd6f
Compare
Contributor
Author
|
Thanks! My stringer for the version keys hadn't gone through correctly -- will wait for green CI. |
Contributor
Author
|
Flaked on #69281. bors r+ |
Contributor
|
Build failed (retrying...): |
Contributor
|
Build succeeded: |
irfansharif
added a commit
to irfansharif/cockroach
that referenced
this pull request
Sep 21, 2021
…ate" This reverts commit ef1dd6f. cockroachdb#70432 reverted cockroachdb#69887, as temporary stop-gap until we release the first 21.2 beta. See the discussion over on cockroachdb#70432 for why we want to queue up this revert to the original revert; this should only be merged after cockroachdb#69826 lands. Release note: None
irfansharif
added a commit
to irfansharif/cockroach
that referenced
this pull request
Oct 25, 2021
…ate" This reverts commit ef1dd6f. cockroachdb#70432 reverted cockroachdb#69887, as temporary stop-gap until we release the first 21.2 beta. See the discussion over on cockroachdb#70432 for why we want to queue up this revert to the original revert; this should only be merged after cockroachdb#69826 lands. Release note: None
craig bot
pushed a commit
that referenced
this pull request
Oct 26, 2021
70464: Re-introduce "kv,migration: rm code handling legacy raft truncated st… r=irfansharif a=irfansharif …ate" This reverts commit ef1dd6f. #70432 reverted #69887, as temporary stop-gap until we release the first 21.2 beta. See the discussion over on #70432 for why we want to queue up this revert to the original revert; this should only be merged after #69826 lands. Release note: None 71962: backup: mark some settings public r=dt a=dt This marks some of BACKUP's cluster settings as public as they are intended for user-tuning to match their desired workload / requirements, such as the delay before invoking priority reads or the target file size. Release note (ops change): Some existing settings related to BACKUP execution are now listed by SHOW CLUSTER SETTINGS. Fixes #71786. Co-authored-by: irfan sharif <irfanmahmoudsharif@gmail.com> Co-authored-by: David Taylor <tinystatemachine@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.
This reverts commit 6464de2. That PR
broke few of our roachtests since we haven't release the 21.2 beta yet.
For our roachtests that exercised the upgrade path, we were effectively
upgrading from 21.1 to 22.1 code (as of that PR) that asserted on the
completion of the long running migration removing the legacy raft
truncated state -- something that would only happen when going through
21.2. Given that, we temporarily revert #69887 while our beta gets
prepared. #69887 (or rather, the revert of this commit) will be
re-introduced to master once #69826 lands.
Fixes #70244.
Fixes #70252.
Fixes #70253.
Fixes #70283.
Fixes #70350.
Fixes #70390.
Release note: None