Skip to content

server,kvtenant: remove usages of gossip.KeyDeprecatedSystemConfig#141849

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
rafiss:remove-sys-config-gossip3
Mar 5, 2025
Merged

server,kvtenant: remove usages of gossip.KeyDeprecatedSystemConfig#141849
craig[bot] merged 1 commit intocockroachdb:masterfrom
rafiss:remove-sys-config-gossip3

Conversation

@rafiss
Copy link
Copy Markdown
Collaborator

@rafiss rafiss commented Feb 21, 2025

followup after #141815

This key was only needed in the 21.2/22.2 mixed version state.

Removing it and the related machinery allows us to make
kvtenant.connector stop implementing SystemConfigProvider.

The key should not be reused until it's entirely deleted from the gossip
network of existing clusters, so for now the string constant remains as
a placeholder.

fixes #76625
Release note: None

@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@rafiss rafiss force-pushed the remove-sys-config-gossip3 branch 4 times, most recently from b622788 to f4b44d6 Compare February 21, 2025 18:22
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Feb 21, 2025

⚪ Sysbench [SQL, 3node, oltp_read_write]
Metric Old Commit New Commit Delta Note Threshold
sec/op 9.573m ±1% 9.556m ±1% ~ p=0.529 n=10 3.0%
errs/op 0.000 ±0% 0.000 ±0% ~ p=1.000 n=10 0.0%
allocs/op 10.15k ±0% 10.15k ±0% ~ p=0.724 n=10 2.0%
B/op 2.180Mi ±0% 2.180Mi ±0% ~ p=0.971 n=10 2.0%
Reproduce

benchdiff binaries:

mkdir -p benchdiff/8645e9b/bin/1058449141
gcloud storage cp gs://cockroach-microbench-ci/builds/8645e9bb0a6187cd43c035d6ed28aa6bbe065bfe/bin/pkg_sql_tests benchdiff/8645e9b/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests
chmod +x benchdiff/8645e9b/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests
mkdir -p benchdiff/2e66bf7/bin/1058449141
gcloud storage cp gs://cockroach-microbench-ci/builds/2e66bf7c1c1e67eaa11c2994380d467224863cb3/bin/pkg_sql_tests benchdiff/2e66bf7/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests
chmod +x benchdiff/2e66bf7/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests

benchdiff command:

benchdiff --run=^BenchmarkSysbench/SQL/3node/oltp_read_write$ --old=2e66bf7 --new=8645e9b ./pkg/sql/tests
⚪ Sysbench [KV, 1node, local, oltp_read_only]
Metric Old Commit New Commit Delta Note Threshold
sec/op 682.2µ ±1% 675.2µ ±2% ~ p=0.089 n=10 2.0%
errs/op 0.000 ±0% 0.000 ±0% ~ p=1.000 n=10 0.0%
allocs/op 439.0 ±0% 439.0 ±0% ~ p=1.000 n=10 1.5%
B/op 254.2Ki ±0% 254.1Ki ±0% ~ p=0.089 n=10 1.5%
Reproduce

benchdiff binaries:

mkdir -p benchdiff/8645e9b/bin/1058449141
gcloud storage cp gs://cockroach-microbench-ci/builds/8645e9bb0a6187cd43c035d6ed28aa6bbe065bfe/bin/pkg_sql_tests benchdiff/8645e9b/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests
chmod +x benchdiff/8645e9b/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests
mkdir -p benchdiff/2e66bf7/bin/1058449141
gcloud storage cp gs://cockroach-microbench-ci/builds/2e66bf7c1c1e67eaa11c2994380d467224863cb3/bin/pkg_sql_tests benchdiff/2e66bf7/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests
chmod +x benchdiff/2e66bf7/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests

benchdiff command:

benchdiff --run=^BenchmarkSysbench/KV/1node_local/oltp_read_only$ --old=2e66bf7 --new=8645e9b ./pkg/sql/tests
⚪ Sysbench [KV, 1node, local, oltp_write_only]
Metric Old Commit New Commit Delta Note Threshold
sec/op 1.335m ±1% 1.338m ±1% ~ p=0.579 n=10 2.5%
errs/op 0.000 ±0% 0.000 ±0% ~ p=1.000 n=10 0.0%
allocs/op 1.393k ±0% 1.394k ±0% ~ p=1.000 n=10 1.8%
B/op 289.8Ki ±1% 290.0Ki ±0% ~ p=0.684 n=10 1.8%
Reproduce

benchdiff binaries:

mkdir -p benchdiff/8645e9b/bin/1058449141
gcloud storage cp gs://cockroach-microbench-ci/builds/8645e9bb0a6187cd43c035d6ed28aa6bbe065bfe/bin/pkg_sql_tests benchdiff/8645e9b/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests
chmod +x benchdiff/8645e9b/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests
mkdir -p benchdiff/2e66bf7/bin/1058449141
gcloud storage cp gs://cockroach-microbench-ci/builds/2e66bf7c1c1e67eaa11c2994380d467224863cb3/bin/pkg_sql_tests benchdiff/2e66bf7/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests
chmod +x benchdiff/2e66bf7/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests

benchdiff command:

benchdiff --run=^BenchmarkSysbench/KV/1node_local/oltp_write_only$ --old=2e66bf7 --new=8645e9b ./pkg/sql/tests
Artifacts

download:

mkdir -p new
gcloud storage cp gs://cockroach-microbench-ci/artifacts/8645e9bb0a6187cd43c035d6ed28aa6bbe065bfe/13463557395-1/\* new/
mkdir -p old
gcloud storage cp gs://cockroach-microbench-ci/artifacts/2e66bf7c1c1e67eaa11c2994380d467224863cb3/13463557395-1/\* old/
Legend
  • Neutral: No significant performance change.
  • 🟡 Warning: Slight degradation, likely due to variance, but still within thresholds.
  • 🔴 Regression: Likely performance regression, requiring investigation.
  • 🟢 Improvement: Possible performance gain.

No regressions detected!

built with commit: 8645e9bb0a6187cd43c035d6ed28aa6bbe065bfe

Copy link
Copy Markdown
Collaborator Author

@rafiss rafiss left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained


pkg/rpc/auth_tenant.go line 300 at r2 (raw file):

	"node:.*",
	"store:.*",
	"system-db",

i need to confirm that this is OK to remove. we might need it as long as we still need the gossip.KeyDeprecatedSystemConfig case in GossipSubscription.

@rafiss rafiss requested a review from arulajmani February 21, 2025 20:17
@rafiss rafiss marked this pull request as ready for review February 21, 2025 20:44
@rafiss rafiss requested review from a team as code owners February 21, 2025 20:44
@rafiss rafiss requested review from angles-n-daemons and removed request for a team and angles-n-daemons February 21, 2025 20:44
This key was only needed in the 21.2/22.2 mixed version state.

Removing it and the related machinery allows us to make
kvtenant.connector stop implementing SystemConfigProvider.

The key should not be reused until it's entirely deleted from the gossip
network of existing clusters, so for now the string constant remains as
a placeholder.

Release note: None
@rafiss rafiss force-pushed the remove-sys-config-gossip3 branch from 4d4a8fc to b606fd4 Compare February 25, 2025 22:43
@rafiss rafiss requested a review from a team as a code owner February 25, 2025 22:43
@rafiss rafiss requested a review from stevendanna February 25, 2025 22:43
Copy link
Copy Markdown
Collaborator

@arulajmani arulajmani left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewed 9 of 14 files at r2, 10 of 10 files at r3, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @rafiss and @stevendanna)


pkg/rpc/auth_tenant.go line 300 at r2 (raw file):

Previously, rafiss (Rafi Shamim) wrote…

i need to confirm that this is OK to remove. we might need it as long as we still need the gossip.KeyDeprecatedSystemConfig case in GossipSubscription.

I don't know for sure off the top of my head, but I'd assume removing this should be fine.

@rafiss
Copy link
Copy Markdown
Collaborator Author

rafiss commented Mar 5, 2025

tftr!

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Mar 5, 2025

Build failed (retrying...):

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Mar 5, 2025

@craig craig bot merged commit 47728a0 into cockroachdb:master Mar 5, 2025
24 checks passed
craig bot pushed a commit that referenced this pull request Mar 6, 2025
142375: rpc: add `system-db` back to gossip subscription allowlist r=rafiss a=rafiss

This was removed overly-eagerly in b606fd4. We still need it since the KeyDeprecatedSystemConfig key can still be gossipped in a mixed version cluster. Removing it from this allowlist causes noisy warning logs.

Epic: None
Informs: #141849
Release note: None

Co-authored-by: Rafi Shamim <rafi@cockroachlabs.com>
@rafiss rafiss deleted the remove-sys-config-gossip3 branch March 7, 2025 06:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

gossip,kvserver,sql: remove the last vestiges of the systemconfig gossip in 22.2.

3 participants