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

log,demo: minor refactor and simplification #53313

Merged
merged 2 commits into from
Aug 24, 2020

Conversation

knz
Copy link
Contributor

@knz knz commented Aug 24, 2020

Release note: None

knz added 2 commits August 24, 2020 12:43
Release note: None
The demo code was trying a complicated dance with the flag structs to
disable logging. This was not necessary - a simple adjustment of the
advertised store config is sufficient to reach the desired effect.

Additionally, this commit provides a hint to the user if they want
to enable redaction markers but there is no logging dir yet.

Release note: None
@knz knz requested review from irfansharif and rohany August 24, 2020 10:46
@knz knz requested a review from a team as a code owner August 24, 2020 10:46
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@knz
Copy link
Contributor Author

knz commented Aug 24, 2020

thanks

bors r=rohany

@craig
Copy link
Contributor

craig bot commented Aug 24, 2020

Build succeeded:

@craig craig bot merged commit d85a88e into cockroachdb:master Aug 24, 2020
@knz knz deleted the 20200824-demo-log branch August 24, 2020 16:14
craig bot pushed a commit that referenced this pull request Aug 24, 2020
53263: util/logs: request redactable logs by default  r=irfansharif a=knz

First two commits from  #53313

This changes the default value for the `--redactable-logs` flag to
`true`. This makes server produce redactable logs by default.

Note that `--redactable-logs` only triggers redactable logs if the
caller calls `SetupRedactionAndStderrRedirects()`. This is done by
e.g. the server code. This means that even with this patch,
*unit tests* continue to produce non-redactable logs.

This commit also adds telemetry for the enablement of redactable
markers, as `server.logging.redactable_logs.{enabled,disabled}`.

Fixes #51834.


Release note (cli change): The `cockroach start`, `start-single-node`
and `demo` command now enable `--redactable-logs` by default.
This causes log files to become redactable, so that 
`cockroach debug merge-log --redact` or `cockroach debug zip --redact`
can remove sensitive information out of log files.
(Reminder: `cockroach debug zip --redact` only affects *log files*;
other items collected by the command can still contain sensitive information)

53295: kvserver: fix race in rangefeed processor setup r=nvanbenschoten a=ajwerner

Fixes #53183

Release note: None

Co-authored-by: Raphael 'kena' Poss <[email protected]>
Co-authored-by: Andrew Werner <[email protected]>
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