search

openshift / linuxptp-daemon

Linuxptp daemon runs as kubernetes DaemonSet and manages linuxptp processes such as ptp4l, phc2sys and timemaster.
Apache License 2.0
28 stars 30 forks source link

[release-4.16] OCPBUGS-37043: prevent writing uninitialized TimePropertiesDS #341

Closed vitus133 closed 3 months ago

vitus133 commented 3 months ago

This PR fixes a bug where the daemon wrote uninitialized values to the time properties dataset, which led to corrupting the ptp time scale, current UTC offset and other dataset properties. The fix is done by always initializing the time properties according to the current UTC offset and a predefined set of flags. Leap manager was changed to provide current UTC offset to external packages.

This is a manual cherrypick of #335 /cc @aneeshkp @jzding @josephdrichard @nishant-parekh

openshift-ci-robot commented 3 months ago

@vitus133: This pull request references Jira Issue OCPBUGS-37043, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug * bug is open, matching expected state (open) * bug target version (4.16.z) matches configured target version for branch (4.16.z) * bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST) * release note type set to "Release Note Not Required" * dependent bug [Jira Issue OCPBUGS-37042](https://issues.redhat.com//browse/OCPBUGS-37042) is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA)) * dependent [Jira Issue OCPBUGS-37042](https://issues.redhat.com//browse/OCPBUGS-37042) targets the "4.17.0" version, which is one of the valid target versions: 4.17.0 * bug has dependents

Requesting review from QA contact: /cc @gsr-shanks

The bug has been updated to refer to the pull request using the external bug tracker.

In response to [this](https://github.com/openshift/linuxptp-daemon/pull/341): >This PR fixes a bug where the daemon wrote uninitialized values to the time properties dataset, which led to corrupting the ptp time scale, current UTC offset and other dataset properties. The fix is done by always initializing the time properties according to the current UTC offset and a predefined set of flags. Leap manager was changed to provide current UTC offset to external packages. > >This is a manual cherrypick of #335 >/cc @aneeshkp @jzding @josephdrichard @nishant-parekh Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Flinuxptp-daemon). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
aneeshkp commented 3 months ago

/label backport-risk-assessed

openshift-ci[bot] commented 3 months ago

@vitus133: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
aneeshkp commented 3 months ago

/retitle [release-4.16] OCPBUGS-37043: prevent writing uninitialized TimePropertiesDS

aneeshkp commented 3 months ago

/lgtm

aneeshkp commented 3 months ago

/label cherry-pick-approved

openshift-ci[bot] commented 3 months ago

@aneeshkp: Can not set label cherry-pick-approved: Must be member in one of these teams: []

In response to [this](https://github.com/openshift/linuxptp-daemon/pull/341#issuecomment-2256054497): >/label cherry-pick-approved Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
openshift-ci[bot] commented 3 months ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aneeshkp, vitus133

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files: - ~~[OWNERS](https://github.com/openshift/linuxptp-daemon/blob/release-4.16/OWNERS)~~ [aneeshkp,vitus133] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
Bonnie-Block commented 3 months ago

/label cherry-pick-approved

openshift-ci-robot commented 3 months ago

@vitus133: Jira Issue OCPBUGS-37043: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-37043 has been moved to the MODIFIED state.

In response to [this](https://github.com/openshift/linuxptp-daemon/pull/341): >This PR fixes a bug where the daemon wrote uninitialized values to the time properties dataset, which led to corrupting the ptp time scale, current UTC offset and other dataset properties. The fix is done by always initializing the time properties according to the current UTC offset and a predefined set of flags. Leap manager was changed to provide current UTC offset to external packages. > >This is a manual cherrypick of #335 >/cc @aneeshkp @jzding @josephdrichard @nishant-parekh Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Flinuxptp-daemon). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
openshift-bot commented 3 months ago

[ART PR BUILD NOTIFIER]

Distgit: linuxptp-daemon This PR has been included in build ose-linuxptp-daemon-container-v4.16.0-202407291537.p0.g382c824.assembly.stream.el9. All builds following this will include this PR.

vitus133 commented 3 months ago

/cherrypick release-4.15

openshift-cherrypick-robot commented 3 months ago

@vitus133: #341 failed to apply on top of branch "release-4.15":

Applying: prevent writing uninitialized TimePropertiesDS
Using index info to reconstruct a base tree...
M   pkg/daemon/daemon.go
M   pkg/leap/leap-file.go
M   pkg/leap/leap-file_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/leap/leap-file_test.go
CONFLICT (content): Merge conflict in pkg/leap/leap-file_test.go
Auto-merging pkg/leap/leap-file.go
CONFLICT (content): Merge conflict in pkg/leap/leap-file.go
Auto-merging pkg/daemon/daemon.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 prevent writing uninitialized TimePropertiesDS
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
In response to [this](https://github.com/openshift/linuxptp-daemon/pull/341#issuecomment-2257661630): >/cherrypick release-4.15 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.