Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tenant: add support to Log endpoints to status server #91604

Merged
merged 1 commit into from
Nov 21, 2022

Conversation

dhartunian
Copy link
Collaborator

@dhartunian dhartunian commented Nov 9, 2022

Previously, the tenant status server did not support the log-file related
endpoints leading to missing logs in the debug.zip when generating for a tenant
server.

This commit migrates the implementations from the standard status server into
the tenant, adjusts for fanout to instances instead of nodes, and leaves the
rest as-is.

Resolves: #91992
Epic: CC-5168

Release note (ops change): generating a debug.zip for a tenant server will now
include logs in the zip file.

@dhartunian dhartunian requested a review from a team November 9, 2022 15:52
@dhartunian dhartunian requested review from a team as code owners November 9, 2022 15:52
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@dhartunian
Copy link
Collaborator Author

The tenant and non-tenant status servers will be merged for 23.1, but this PR is intended for backporting so we can support logs in debug.zip for 22.2

Copy link
Contributor

@knz knz left a comment

Choose a reason for hiding this comment

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

we're in agreement this will eventually become a single implementation shared with status.go, right?

@knz
Copy link
Contributor

knz commented Nov 9, 2022

no objection

Copy link
Contributor

@abarganier abarganier left a comment

Choose a reason for hiding this comment

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

:lgtm: - you are a hero with this turnaround time!

I went ahead and tested on a cluster where multiple SQL instances were running for a single tenant. Logs were collected from all instances 🎉

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

@dhartunian dhartunian force-pushed the add-log-endpoints-to-tenant branch from 9a7c460 to 90d86ef Compare November 16, 2022 16:12
@dhartunian dhartunian requested a review from a team November 16, 2022 16:12
Previously, the tenant status server did not support the log-file related
endpoints leading to missing logs in the debug.zip when generating for a tenant
server.

This commit migrates the implementations from the standard status server into
the tenant, adjusts for fanout to instances instead of nodes, and leaves the
rest as-is.

Resolves: cockroachdb#91992
Epic: CC-5168

Release note (ops change): generating a debug.zip for a tenant server will now
include logs in the zip file.
@dhartunian dhartunian force-pushed the add-log-endpoints-to-tenant branch from 90d86ef to 8e31f56 Compare November 16, 2022 16:18
@dhartunian
Copy link
Collaborator Author

bors r=abarganier, knz

@craig
Copy link
Contributor

craig bot commented Nov 21, 2022

Build succeeded:

@craig craig bot merged commit 0354b67 into cockroachdb:master Nov 21, 2022
@blathers-crl
Copy link

blathers-crl bot commented Nov 21, 2022

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from 8e31f56 to blathers/backport-release-22.2-91604: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 403 Resource not accessible by integration []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 22.2.x failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is otan.

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.

debug zips generated for a sql tenant should include logs from that tenant
4 participants