release-23.1.0: sql: avoid tenant ID reuse #101847
Merged
Conversation
This file contains 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
|
Thanks for opening a backport. Please check the backport criteria before merging:
If some of the basic criteria cannot be satisfied, ensure that the exceptional criteria are satisfied within.
Add a brief release justification to the body of your PR to justify this backport. Some other things to consider:
|
knz
requested review from
benbardin and
cucaroach
and removed request for
a team
|
This change is |
knz
force-pushed
the
backport23.1.0-101845
branch
from
b623053 to
414c067
Compare
Release note: None
We really want to use different tenant IDs every time, to avoid tenant ID reuse. For this, we use a new sequence `system.tenant_id_seq`. However, there are two obstacles that prevent us from using only the sequence. The first is that the sequence is added in a migration and at the point this function is called the migration may not have been run yet. Separately, we also have the function `crdb_internal.create_tenant()` which can define an arbitrary tenant ID. So we proceed as follows: - we find the maximum tenant ID that has been used so far. This covers cases where the migration has not been run yet and also arbitrary ID selection by create_tenant(). - we also find the next value of the sequence, if it exists already. - we take the maximum of the two values (plus one) as the next ID. - we also update the sequence with the new value we've chosen. Release note: None
knz
force-pushed
the
backport23.1.0-101845
branch
from
414c067 to
0b2e13c
Compare
yuzefovich
approved these changes
Apr 20, 2023
There was a problem hiding this comment.
Same comments as on #101845, but otherwise LGTM.
Reviewable status:
complete! 0 of 0 LGTMs obtained (waiting on @benbardin, @cucaroach, and @stevendanna)
This patch introduces a limit (MaxUint32) to the fixed IDs that can be selected by `crdb_internal.create_tenant`. This ensures that there are always IDs remaining available for CREATE TENANT after the maximum value has been selected via `create_tenant`. Release note: None
Release note: None
dhartunian
approved these changes
Apr 20, 2023
There was a problem hiding this comment.
Reviewed 98 of 98 files at r1, 5 of 12 files at r2.
Reviewable status:
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Backport
/cc @cockroachdb/release
Epic: CRDB-23559
Release justification: helps prevent data corruption and security issues in multi-tenant deployments