-
Notifications
You must be signed in to change notification settings - Fork 3.8k
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
release-21.2: cli,log: allow use of debug merge-logs
on older logs
#83748
release-21.2: cli,log: allow use of debug merge-logs
on older logs
#83748
Conversation
Fixes cockroachdb#68278. Log parsers require the flag --format when parsing older logs (because they do not contain format specification). With this patch, this is no longer a requirement as the log format is now inferred based on the structure of the log if no log format specification exists. Release justification: bug fix Release note (bug fix): The debug merge-logs command no longer returns an error when the log decoder attempts to parse older logs. Co-authored-by: Cameron Nunez <[email protected]>
Thanks for opening a backport. Please check the backport criteria before merging:
If some of the basic criteria cannot be satisfied, ensure that the exceptional criteria are satisfied within.
Add a brief release justification to the body of your PR to justify this backport. Some other things to consider:
|
@cameronnunez friendly ping :) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewable status: complete! 1 of 0 LGTMs obtained (waiting on @cameronnunez)
Merging since this seems uncontroversial and the diff is identical to the original. |
@cameronnunez I think this PR was supposed to make it into 21.2 but it never did since the date looks like it was merged during stability and got forgotten in the shuffle. I'm trying to backport #79356 via #83147 and ran into some test failures and merge conflicts that made me realize there was a piece missing.
Seems straightforward that we should backport this since it was originally intended to be in 21.2 and helps with log management.
Backport 1/1 commits from #68282.
/cc @cockroachdb/release
Fixes #68278.
Log parsers require the flag
--format
when parsing older logs (becausethey do not contain format specification). With this patch, this is no longer
a requirement as the log format is now inferred based on the structure of
the log if no log format specification exists.
Release justification: bug fix
Release note (bug fix): The debug merge-logs command no longer returns an error
when the log decoder attempts to parse older logs.