Skip to content

server,cli: ensure the server identifiers are properly logged in SQL pds#58862

Merged
craig[bot] merged 2 commits intocockroachdb:masterfrom
knz:20210112-log-clusterid
Jan 15, 2021
Merged

server,cli: ensure the server identifiers are properly logged in SQL pds#58862
craig[bot] merged 2 commits intocockroachdb:masterfrom
knz:20210112-log-clusterid

Conversation

@knz
Copy link
Copy Markdown
Contributor

@knz knz commented Jan 12, 2021

This is a forward-port of a change (#58708) we've discovered was necessary in v20.2.

Release note: None

@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@knz knz force-pushed the 20210112-log-clusterid branch from 63c42ce to d955224 Compare January 13, 2021 13:09
@knz knz requested a review from tbg January 13, 2021 13:10
@knz knz force-pushed the 20210112-log-clusterid branch from d955224 to e6e5f14 Compare January 13, 2021 13:16
@knz knz marked this pull request as ready for review January 13, 2021 13:16
@knz knz requested a review from a team January 13, 2021 13:16
@knz knz requested a review from a team as a code owner January 13, 2021 13:16
@knz knz requested review from pbardea and removed request for a team January 13, 2021 13:16
@knz
Copy link
Copy Markdown
Contributor Author

knz commented Jan 13, 2021

Now also includes roachtest.

@knz
Copy link
Copy Markdown
Contributor Author

knz commented Jan 13, 2021

Nb: the log.TestingClearServerIdentifier() logic is ugly but hard to avoid until we fix #58938

@knz knz force-pushed the 20210112-log-clusterid branch from ea44544 to 17574e7 Compare January 13, 2021 14:32
@pbardea pbardea removed their request for review January 13, 2021 14:33
@knz knz force-pushed the 20210112-log-clusterid branch 2 times, most recently from a81818d to a6f41ef Compare January 13, 2021 16:30
@knz knz requested a review from itsbilal January 13, 2021 17:04
…pods

This is a forward-port of a change we've discovered was necessary in
v20.2: we want the cluster ID and other server identifiers to be
reported in log files. This was not possible before.

Release note: None
@knz knz force-pushed the 20210112-log-clusterid branch from a6f41ef to b483a26 Compare January 14, 2021 12:43
Copy link
Copy Markdown
Contributor

@itsbilal itsbilal 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 6 of 9 files at r1, 6 of 6 files at r2.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @tbg)

@knz
Copy link
Copy Markdown
Contributor Author

knz commented Jan 15, 2021

thanks!

bors r=itsbilal

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jan 15, 2021

This PR was included in a batch that was canceled, it will be automatically retried

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jan 15, 2021

Build failed (retrying...):

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jan 15, 2021

Build succeeded:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants