clusterversion,kvserver,server,security: remove 22.1 gates#85777
clusterversion,kvserver,server,security: remove 22.1 gates#85777craig[bot] merged 16 commits intocockroachdb:masterfrom
Conversation
|
This change is |
f28e5ba to
6b7cc5d
Compare
6c3d3b8 to
64be12d
Compare
knz
left a comment
There was a problem hiding this comment.
LGTM for the SCRAMAuthentication changes, with a nit.
Didn't review the other changes.
Reviewable status:
complete! 0 of 0 LGTMs obtained (waiting on @adityamaru, @aliher1911, @celiala, @dt, @irfansharif, and @tbg)
pkg/sql/pgwire/hba_conf.go line 364 at r4 (raw file):
} // chainOptions is an option that combines its argument options.
Could you leave these two functions in, if only via a var _ = chainOptions to prevent the linter warning. I believe @kpatron-cockroachlabs will need them in an upcoming PR.
|
@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! |
64be12d to
7c4c49d
Compare
irfansharif
left a comment
There was a problem hiding this comment.
They don't need to be done atomically (David and Yahor have been removing other cluster versions in other PRs for ex.)
There was a problem hiding this comment.
TFTR!
Bazel Essential CI is failing for pkg/ccl/serverccl/serverccl_test_/serverccl_test. But I see a history of fails and I don't think this PR impacted the pkg/ccl/serverccl/ area?
Since this is a relatively straight-forward cleanup, and since all other tests pass, I will merge soon to unblock remaining version gate cleanup, if I don't hear from other groups.
8/10 Update: More version gates were added, which are also relatively straight-forward cleanups. I'm going to try to merge this by EOD Thursday or sometime Friday, in order to bump the minVersion, since we select alpha candidate next week.
Reviewable status:
pkg/sql/pgwire/hba_conf.go line 364 at r4 (raw file):
Done. Added:
var _ = chainOptions
var _ = requireClusterVersion
fd8958d to
8ddd140
Compare
8ddd140 to
dc483ab
Compare
Release note: None
Release note: none
Release note: None
Release note: None
Release note: None
Release note: None
Release note: None
Release note: none
Release note: None
…sfers Release note: None
Release note: none
Release note: none
Release note: None
Release note: None
Release note: None
…ntTable Release note: None
dc483ab to
0da16b7
Compare
|
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):
|
|
Build succeeded: |
This code was (re-)added in cockroachdb#80190 to version gate the new 22.1 store rebalancer behavior by keeping the 21.2 one form around. In 22.2 code though we can and did get rid of the version gate (cockroachdb#85777), so all this code can be removed. Release note: None
86060: kvserver: rm EnableNewStoreRebalancer detritus r=irfansharif a=irfansharif This code was (re-)added in #80190 to version gate the new 22.1 store rebalancer behavior by keeping the 21.2 form around. In 22.2 code though we can and did get rid of the version gate (#85777), so all this code can be removed. Release note: None 86064: vendor: bump Pebble to 84fa6a019ed4 r=erikgrinaker,nicktrav a=jbowens ``` 84fa6a01 db: add Metrics.Keys.RangeKeySetsCount f4b082db db: avoid defragmenting beyond prefix bounds during prefix iteration c135b6df metamorphic: use pointer receiver ``` Release note: None Co-authored-by: irfan sharif <irfanmahmoudsharif@gmail.com> Co-authored-by: Jackson Owens <jackson@cockroachlabs.com>
This commit removes the following 22.1 version gates:
(✅ denotes explicit LGTM)
8/8: initial PR version gates
8/10 Update: Additionally, these version gates to added to this commit
✅ storage: EnablePebbleFormatVersionBlockProperties8/12: TODO in future PR.✅ sql: RowLevelTTL8/12: TODO in future PR.✅ sql: SuperRegions8/12: TODO in future PR.changefeedccl: EnableNewChangefeedOptions8/12: TODO in future PR.The cleanup for these version gates was fairly straight-forward, using the guidance from 21.2 cleanup:
22.1 version gates requiring more nuanced removal will be done in separate PRs.
Partially addresses #80663