cockroach
cockroach copied to clipboard
clusterversion,kvserver,server,security:remove 22.1 gates
This commit removes the following 22.1 version gates:
**Version gates from 8/8 **
- kvserver: ProbeRequest,
- security,pgwire: SCRAMAuthentication,
- server: UnsafeLossOfQuorumRecoveryRangeLog,
- kvserver: AlterSystemProtectedTimestampAddColumn
8/10 Update: Additionally, these version gates to added to this commit
- backupccl: EnableProtectedTimestampsForTenant
- DeleteCommentsWithDroppedIndexes
- sql/catalog: RemoveIncompatibleDatabasePrivileges
- kvserver: AddRaftAppliedIndexTermMigration
- clusterversion: PostAddRaftAppliedIndexTermMigration
- kvserver: DontProposeWriteTimestampForLeaseTransfers
- storage: EnablePebbleFormatVersionBlockProperties
- sql: MVCCIndexBackfiller
- kvserver: LooselyCoupledRaftLogTruncation
- sql: RowLevelTTL
- kvserver: EnableNewStoreRebalancer
- sql: SuperRegions
- changefeedccl: EnableNewChangefeedOptions
- SpanCountTable
- spanconfig: PreSeedSpanCountTable, SeedSpanCountTable
- sql: EnableDeclarativeSchemaChanger
The cleanup for these version gates was fairly straight-forward, using the 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]).
22.1 version gates requiring more nuanced removal will be done in separate PRs.
Partially addresses https://github.com/cockroachdb/cockroach/issues/80663
@dt @irfansharif - I'm going to remove the version gates in multiple passes, but let me know if version gate removal + bumping minVersion needs to be done more atomically. Thanks!
bors r+
bors cancel
Canceled.
I meant to push the additional 8/10 version gate removals to a separate branch, but accidentally pushed to this PR:
Since the 8/10 commits were also straight-forward removals, I will go ahead and keep them in this PR. But this means I'm re-adding @cockroachdb/kv-prs to review the version gates that have been added today.
Schema LGTM for:
- clusterversion: remove DeleteCommentsWithDroppedIndexes
- clusterversion,sql: remove MVCCIndexBackfiller
- clusterversion,sql: remove EnableDeclarativeSchemaChanger
- clusterversion,sql: remove RowLevelTTL
- clusterversion,sql: remove SuperRegions
TFTRs!
bors r+
8/12 Update: These version gate removals were reverted (removed from this PR) to pass tests. To be addressed separately (future PRs):
- storage: EnablePebbleFormatVersionBlockProperties
- sql: RowLevelTTL
- sql: SuperRegions
- changefeedccl: EnableNewChangefeedOptions