server: server identity returns nodeID for system tenant #103148
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
dhartunian
added
the
backport-23.1.x
|
This change is |
Previously, the server identity object would hide the nodeID from identity objects that contained a set tenantID. This was done to create separation of concerns between a secondary tenant and the rest of the cluster. However, this identity is used in populating log payloads with contextual metadata. That led to cockroachdb#103112 due to the fact that the system tenant sets its tenantId to 1 which led to a hidden nodeID. We now always emit the nodeID when the tenantID is set to the system tenant. Fixes cockroachdb#103112 Release note (bug fix): 23.1.0 contained a bug where the `node_id` field would be omitted in logs. This fix restores that value.
dhartunian
force-pushed
the
restore-node-id-in-logs
branch
from
61290f5
to
4148b58
Compare
aadityasondhi
approved these changes
May 22, 2023
|
bors r= aadityasondhi |
|
Build failed: |
|
failed on unrelated flake #103791 bors r=aadityasondhi |
|
Build failed (retrying...): |
|
Build succeeded: |
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.
Previously, the server identity object would hide the nodeID from identity objects that contained a set tenantID. This was done to create separation of concerns between a secondary tenant and the rest of the cluster. However, this identity is used in populating log payloads with contextual metadata. That led to #103112 due to the fact that the system tenant sets its tenantId to 1 which led to a hidden nodeID.
We now always emit the nodeID when the tenantID is set to the system tenant.
Fixes #103112
Release note (bug fix): 23.1.0 contained a bug where the
node_idfield would be omitted in logs. This fix restores that value.