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.

Sign up for GitHub

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

Jump to bottom

release-23.1: cli/doctor: address issues in the debug doctor command #104832

Merged
merged 2 commits into from
Jun 27, 2023
Merged

release-23.1: cli/doctor: address issues in the debug doctor command #104832

merged 2 commits into from
Jun 27, 2023

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Jun 13, 2023 •
edited by fqazi
Loading

Backport 3/3 commits from #104641 on behalf of @fqazi.

/cc @cockroachdb/release

Previously, the debug doctor had the following issues on master:

  1. Running the 23.1 / master doctor against older cluster versions would run into issues with the jobs tables since we started using a new crdb_internal table to get a similar view
  2. Quoted table names in a zip directory were not unescaped properly, which could lead to validation errors

Release justification: low risk and fixes bugs running against older versions

@blathers-crl blathers-crl bot requested review from a team as code owners June 13, 2023 23:32
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.1-104641 branch from b75c12d to e0b28ae Compare June 13, 2023 23:32
@blathers-crl blathers-crl bot requested review from srosenberg and renatolabs and removed request for a team June 13, 2023 23:32
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.1-104641 branch from b203c85 to e887edf Compare June 13, 2023 23:32
@blathers-crl blathers-crl bot added the blathers-backport This is a backport that Blathers created automatically. label Jun 13, 2023
@blathers-crl
Copy link
Author

blathers-crl bot commented Jun 13, 2023

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Patches should only be created for serious issues or test-only changes.
  • Patches should not break backwards-compatibility.
  • Patches should change as little code as possible.
  • Patches should not change on-disk formats or node communication protocols.
  • Patches should not add new functionality.
  • Patches must not add, edit, or otherwise modify cluster versions; or add version gates.
If some of the basic criteria cannot be satisfied, ensure that the exceptional criteria are satisfied within.
  • There is a high priority need for the functionality that cannot wait until the next release and is difficult to address in another way.
  • The new functionality is additive-only and only runs for clusters which have specifically “opted in” to it (e.g. by a cluster setting).
  • New code is protected by a conditional check that is trivial to verify and ensures that it only runs for opt-in clusters.
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.

Add a brief release justification to the body of your PR to justify this backport.

Some other things to consider:

  • What did we do to ensure that a user that doesn’t know & care about this backport, has no idea that it happened?
  • Will this work in a cluster of mixed patch versions? Did we test that?
  • If a user upgrades a patch version, uses this feature, and then downgrades, what happens?

@blathers-crl blathers-crl bot added the O-robot Originated from a bot. label Jun 13, 2023
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@fqazi fqazi force-pushed the blathers/backport-release-23.1-104641 branch from e887edf to 4f9e94d Compare June 26, 2023 14:16
@fqazi
Copy link
Collaborator

fqazi commented Jun 26, 2023

@cockroachdb/sql-foundations Can some one take a look at this backport?

chengxiong-ruan
chengxiong-ruan approved these changes Jun 26, 2023
View reviewed changes
pkg/cli/doctor.go Outdated Show resolved Hide resolved
@fqazi
cli/doctor: make backwards compatible with older jobs tables
fb6ffde 
Previously, the CLI debug doctor command was updated to be
able to read the crdb_internal.system_jobs. This table
doesn't exist on older releases, so the doctor command
could only be run against the latest releases. To address,
this patch adds support for running doctor against
different releases.

Epic: none
Fixes: #104352
Releases note (bug fix): Fixed a bug that prevented
debug doctor from running against older versions of
Cockroach.
@fqazi
cli/doctor: handle quoted namespace entries
8d703df 
Previously, when parsing the namespace entries
we did not handle quoted table names properly.
This patch addresses, this by unquoting entries
properly.

Fixes: #104347

Release note: None
@fqazi fqazi force-pushed the blathers/backport-release-23.1-104641 branch from 4f9e94d to 8d703df Compare June 27, 2023 13:25
@fqazi
Copy link
Collaborator

fqazi commented Jun 27, 2023

@chengxiong-ruan TFTR!

@fqazi fqazi merged commit aa9ca41 into release-23.1 Jun 27, 2023
@fqazi fqazi deleted the blathers/backport-release-23.1-104641 branch June 27, 2023 14:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chengxiong-ruan chengxiong-ruan chengxiong-ruan approved these changes

@srosenberg srosenberg Awaiting requested review from srosenberg srosenberg is a code owner automatically assigned from cockroachdb/test-eng

@renatolabs renatolabs Awaiting requested review from renatolabs renatolabs is a code owner automatically assigned from cockroachdb/test-eng

@fqazi fqazi Awaiting requested review from fqazi

@rafiss rafiss Awaiting requested review from rafiss

Assignees

@fqazi fqazi

Labels
blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@cockroach-teamcity @fqazi @chengxiong-ruan