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

DOC-10406 Clarify debug zip --timeout flag as "per request" #18613

Merged
merged 4 commits into from
Jun 4, 2024

Conversation

florence-crl
Copy link
Contributor

@florence-crl florence-crl commented Jun 3, 2024

Fixes DOC-10406

In cockroach-debug-zip.md, clarified that --timeout flag is "per request".

Rendered preview: cockroach debug zip General flags

Copy link

github-actions bot commented Jun 3, 2024

Files changed:

Copy link

netlify bot commented Jun 3, 2024

Deploy Preview for cockroachdb-api-docs canceled.

Name Link
🔨 Latest commit bfea918
🔍 Latest deploy log https://app.netlify.com/sites/cockroachdb-api-docs/deploys/665f78ac78107b000783412f

Copy link

netlify bot commented Jun 3, 2024

Deploy Preview for cockroachdb-interactivetutorials-docs canceled.

Name Link
🔨 Latest commit bfea918
🔍 Latest deploy log https://app.netlify.com/sites/cockroachdb-interactivetutorials-docs/deploys/665f78acfc396f0008727401

Copy link

netlify bot commented Jun 3, 2024

Netlify Preview

Name Link
🔨 Latest commit bfea918
🔍 Latest deploy log https://app.netlify.com/sites/cockroachdb-docs/deploys/665f78ac2cc72c000847a184
😎 Deploy Preview https://deploy-preview-18613--cockroachdb-docs.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@florence-crl florence-crl requested a review from xinhaoz June 3, 2024 14:04
Copy link
Contributor

@taroface taroface left a comment

Choose a reason for hiding this comment

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

LGTM, a few suggested tweaks

src/current/v24.1/cockroach-debug-zip.md Outdated Show resolved Hide resolved
@@ -118,7 +118,7 @@ Flag | Description
`--nodes` | Specify nodes to inspect as a comma-separated list or range of node IDs. For example:<br /><br />`--nodes=1,10,13-15`
`--redact` | Redact sensitive data from the generated `.zip`, with the exception of range keys, which must remain unredacted because they are essential to support CockroachDB. This flag replaces the deprecated `--redact-logs` flag, which only applied to log messages contained within `.zip`. See [Redact sensitive information](#redact-sensitive-information) for an example.
`--redact-logs` | **Deprecated** Redact sensitive data from collected log files only. Use the `--redact` flag instead, which redacts sensitive data across the entire generated `.zip` as well as the collected log files. Passing the `--redact-logs` flag will be interpreted as the `--redact` flag.
`--timeout` | Return an error if the command does not conclude within a specified nonzero value. The timeout is suffixed with `s` (seconds), `m` (minutes), or `h` (hours). For example:<br /><br />`--timeout=2m`
`--timeout` | In the process of generating a debug zip, many internal requests are made. Each request is subject to this timeout limit.<br /><br />Return an error if an internal request does not conclude within a specified nonzero value. The timeout is suffixed with `s` (seconds), `m` (minutes), or `h` (hours).<br /><br />**Default:** `60s`
Copy link
Contributor

Choose a reason for hiding this comment

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

This seems more straightforward to me, but I'm not sure how much better it is. I'll defer to you.

Suggested change
`--timeout` | In the process of generating a debug zip, many internal requests are made. Each request is subject to this timeout limit.<br /><br />Return an error if an internal request does not conclude within a specified nonzero value. The timeout is suffixed with `s` (seconds), `m` (minutes), or `h` (hours).<br /><br />**Default:** `60s`
`--timeout` | Return an error if any of the multiple requests used to generate a debug zip does not conclude within a specified nonzero value. The timeout is suffixed with `s` (seconds), `m` (minutes), or `h` (hours).<br /><br />**Default:** `60s`

@florence-crl florence-crl merged commit 1408b4b into main Jun 4, 2024
6 checks passed
@florence-crl florence-crl deleted the DOC-10406 branch June 4, 2024 20:38
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