Skip to content

clusterversion,kvserver: remove EnableLeaseHolderRemoval#85864

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
celiala:remove-gate.EnableLeaseHolderRemoval
Aug 19, 2022
Merged

clusterversion,kvserver: remove EnableLeaseHolderRemoval#85864
craig[bot] merged 1 commit intocockroachdb:masterfrom
celiala:remove-gate.EnableLeaseHolderRemoval

Conversation

@celiala
Copy link
Copy Markdown
Collaborator

@celiala celiala commented Aug 9, 2022

This commit removes the 22.1 EnableLeaseHolderRemoval version gates.

Cleanup was done following guidance from 21.2 cleanup:

For the most part, if the gates were just simple if !version.IsActive { return x } or something, I just removed the block, and even if it was a little more complicated, like args = [x]; if version { args = append(args, y) }; foo(args) I still tried to mostly inline it such that it looked natural (i.e. remove that append and make it args = [x, y]).

However for just a couple more complicated cases that were referring to <21.2 versions that needed to be replaced when those were deleted, I added a placeholder clusterversion.TODOPre21_2 alias for 21.2. Replacing those calls with this alias shouldn't change their behavior -- it was already always true, since the code today should never run in a <21.2 cluster -- but means we can delete those older versions in the meantime and then the owners of these bits can decide how to update them.

Partially addresses #80663

Release justification: remove version gate

Release note: none

@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@celiala
Copy link
Copy Markdown
Collaborator Author

celiala commented Aug 11, 2022

Note that this passes essential CI but is failing extended CI for these tests:

github.com/cockroachdb/cockroach/pkg/kv/kvserver:

  • TestReplicateQueueShouldQueueNonVoter
  • TestTruncateLog
  • TestTruncateLog/loosely-coupled=false

Hopefully the team can give guidance as to whether these are flakes or if it requires further investigation.

@celiala celiala marked this pull request as ready for review August 11, 2022 00:10
@celiala celiala requested a review from a team as a code owner August 11, 2022 00:10
@celiala celiala requested a review from shralex August 11, 2022 00:28
@celiala celiala force-pushed the remove-gate.EnableLeaseHolderRemoval branch from 562c9b8 to cd1b702 Compare August 11, 2022 23:06
@celiala celiala force-pushed the remove-gate.EnableLeaseHolderRemoval branch 2 times, most recently from 05c6cac to 641f8b8 Compare August 19, 2022 01:38
Release justification: Removing old version gate.
Release note: None
@celiala celiala force-pushed the remove-gate.EnableLeaseHolderRemoval branch from 641f8b8 to 9f5f60b Compare August 19, 2022 01:51
@celiala
Copy link
Copy Markdown
Collaborator Author

celiala commented Aug 19, 2022

TFTR!

bors r=shralex

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Aug 19, 2022

Build succeeded:

@craig craig bot merged commit 8826516 into cockroachdb:master Aug 19, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants