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: timeutil/ptp: fix conversion from seconds to Time #108113

Merged
merged 1 commit into from Aug 3, 2023
Merged

release-23.1: timeutil/ptp: fix conversion from seconds to Time #108113

merged 1 commit into from Aug 3, 2023

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Aug 3, 2023 •
edited by pav-kv

Backport 1/1 commits from #108094 on behalf of @pavelkalinnikov.

/cc @cockroachdb/release

Epic: none
Release note (bug fix): since 22.2.0, using a PTP clock device (enabled by the --clock-device flag) would generate timestamps in the far future. It now generates the correct time. This could cause nodes to crash due to incorrect timestamps, or in the worst case irreversibly advance the cluster's HLC clock into the far future.

Release justification: serious bug fix

@pav-kv
timeutil/ptp: fix conversion from seconds to Time
24d368a 
Epic: none
Release note (bug fix): since 22.2.0, using a PTP clock device (enabled by the
--clock-device flag) would generate timestamps in the far future. It now
generates the correct time. This could cause nodes to crash due to incorrect
timestamps, or in the worst case irreversibly advance the cluster's HLC clock
into the far future.
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.1-108094 branch from 9011b54 to a3be1d4 Compare August 3, 2023 14:48
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Aug 3, 2023
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.1-108094 branch from ccb1cc3 to 24d368a Compare August 3, 2023 14:48
@blathers-crl
Copy link
Author

blathers-crl bot commented Aug 3, 2023 •
edited by pav-kv

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 requested review from knz and pav-kv August 3, 2023 14:48
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@pav-kv pav-kv merged commit 0476a36 into release-23.1 Aug 3, 2023
6 checks passed
@pav-kv pav-kv deleted the blathers/backport-release-23.1-108094 branch August 3, 2023 15:58
@pav-kv pav-kv mentioned this pull request Mar 5, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@knz knz knz approved these changes

@erikgrinaker erikgrinaker Awaiting requested review from erikgrinaker

@pav-kv pav-kv Awaiting requested review from pav-kv

Assignees

@pav-kv pav-kv

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.

None yet
3 participants
@cockroach-teamcity @knz @pav-kv