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-21.2: log: add version field to json formatted log entries #70450

Merged
merged 1 commit into from
Oct 3, 2021
Merged

release-21.2: log: add version field to json formatted log entries #70450

merged 1 commit into from
Oct 3, 2021

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Sep 20, 2021

Backport 1/1 commits from #70285 on behalf of @cameronnunez.

/cc @cockroachdb/release

Fixes #70202.

Release note (cli change): version details have been added to all json formatted
log entries. Refer to the reference docs for details about the field.

Release justification:

@blathers-crl blathers-crl bot requested review from a team as code owners September 20, 2021 22:32
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-21.2-70285 branch from f33a61e to c540ada Compare September 20, 2021 22:32
@blathers-crl blathers-crl bot requested review from cameronnunez and knz September 20, 2021 22:32
@blathers-crl
Copy link
Author

blathers-crl bot commented Sep 20, 2021 •
edited by knz
Loading

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Patches should only be created for serious issues.
  • 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?

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@knz
Copy link
Contributor

knz commented Sep 20, 2021

We can wait until 21.2 passes 21.2.0 to merge this.

@knz
Copy link
Contributor

knz commented Sep 20, 2021

@thtruo please confirm which version of 21.2 we want this in

@knz
Copy link
Contributor

knz commented Sep 21, 2021

Abandoning since this doesn't pass CI yet

@knz knz closed this Sep 21, 2021
@cameronnunez cameronnunez reopened this Sep 30, 2021
@cameronnunez cameronnunez removed request for a team, knz and cameronnunez October 1, 2021 19:24
@cameronnunez
log: add version field to json formatted log entries
54c554f 
Release note (cli change): version details have been added to all json
formatted log entries. Refer to the reference docs for details about
the field.
@cameronnunez cameronnunez force-pushed the blathers/backport-release-21.2-70285 branch from c540ada to 54c554f Compare October 1, 2021 19:31
thtruo
thtruo approved these changes Oct 1, 2021
View reviewed changes
Copy link
Contributor

@thtruo thtruo left a comment

Choose a reason for hiding this comment

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

Thanks Cameron. Your change for adding the new version field to json formatted logs looks good to me!

@cameronnunez
Copy link
Contributor

thanks guys!

bors r=thtruo,knz

@craig
Copy link
Contributor

craig bot commented Oct 3, 2021

Build succeeded:

@craig craig bot merged commit bd00c35 into release-21.2 Oct 3, 2021
@cockroach-teamcity cockroach-teamcity mentioned this pull request Oct 3, 2021
Closed
@jlinder jlinder deleted the blathers/backport-release-21.2-70285 branch October 5, 2021 13:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thtruo thtruo thtruo approved these changes

@knz knz knz approved these changes

@arulajmani arulajmani Awaiting requested review from arulajmani

@otan otan Awaiting requested review from otan

Assignees

@cameronnunez cameronnunez

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@cockroach-teamcity @knz @cameronnunez @thtruo