server,util: reduce usage of tenant 2 as an application tenant from tests#148805
Open
Nukitt wants to merge 1 commit intocockroachdb:masterfrom
Open
server,util: reduce usage of tenant 2 as an application tenant from tests#148805Nukitt wants to merge 1 commit intocockroachdb:masterfrom
Nukitt wants to merge 1 commit intocockroachdb:masterfrom
Conversation
Member
…ests This PR is similar to cockroachdb#148804. Currently, we use tenant ID 2 as an application tenant in various tests. However, in normal operational scenarios, the creation of tenant ID 2 is explicitly disabled to avoid conflicts with its role in UA, as detailed here: https://github.com/cockroachdb/cockroach/blob/9919801f067f26c951f43cbedfa093c37cdda20e/pkg/sql/tenant_creation.go#L604-L609 With the ongoing migration towards UA, tenant ID 2 will begin functioning as a system tenant. Consequently, we are shifting the application tenant role from tenant ID 2 to tenant ID 3 to clearly separate the roles and responsibilities of system and application tenants. This patch specifically addresses and reduces the usage of tenant ID 2 within tests, ensuring tests align with this architectural adjustment and maintaining consistency across the codebase. Part of: cockroachdb#138801 Epic : CRDB-45181 Release note: none
This file contains hidden or 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
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.
This PR is similar and in continuation to #148804.
Currently, we use tenant ID 2 as an application tenant in various tests.
However, in normal operational scenarios, the creation of tenant ID 2 is
explicitly disabled to avoid conflicts with its role in UA, as detailed here:
cockroach/pkg/sql/tenant_creation.go
Lines 604 to 609 in 9919801
With the ongoing migration towards UA, tenant ID 2 will begin functioning
as a system tenant.
Consequently, we are shifting the application tenant role from tenant ID 2 to
tenant ID 3 to clearly separate the roles and responsibilities of system and
application tenants. This patch specifically addresses and reduces the usage
of tenant ID 2 within tests, ensuring tests align with this architectural adjustment
and maintaining consistency across the codebase.
Part of: #138801
Epic : CRDB-45181
Release note: none