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

[release-4.14] OCPBUGS-26238: Backport 2 WPC Cards #263

Merged
merged 13 commits into from
Jan 18, 2024

Conversation

jzding
Copy link
Contributor

@jzding jzding commented Jan 11, 2024

This backport includes the following PRs from release-4.15:

#230
OCPBUGS-20514: PTP HW Clock Class after disabling NMEA sentences set to FREERUN

#235
Add iface details for multiple cards

#234
dual ts2phc /dpll support for multi card T-GM

#236
get hardware clockId for each DPLL

#237
Fix PtpSettings nil-pointer

#240
get PhcId from ethtool

#238
Add DPLL event subscription for multiple cards

#242
OCPBUGS-24043: nmea_status and clock_class metrics missing in 4.14 linuxptpdaemon

#245 (empty, content already in).
OCPBUGS-24010: fixup node profile access from plugin

#243
Fix master metrics interface names

#244
Bug OCPBUGS-24304: GM clock state stays locked when 1PPS lost

#255
[release-4.15] OCPBUGS-26070: T-GM ts2phc IERS Bulletin expired December the 28thupdate leap file to june 2024

#261
[release-4.15] OCPBUGS-26505: False GM process with unknown interface appears after node reboot

#262
Add unit tests for metrics and events

aneeshkp and others added 13 commits January 9, 2024 17:23
Signed-off-by: Aneesh Puttur <aputtur@redhat.com>
Signed-off-by: Jack Ding <jackding@gmail.com>
Signed-off-by: Aneesh Puttur <aputtur@redhat.com>
Signed-off-by: Jack Ding <jackding@gmail.com>
Signed-off-by: Jack Ding <jackding@gmail.com>
Signed-off-by: Jack Ding <jackding@gmail.com>
Signed-off-by: Jack Ding <jackding@gmail.com>
Signed-off-by: Aneesh Puttur <aputtur@redhat.com>
Signed-off-by: Jack Ding <jackding@gmail.com>
Signed-off-by: Aneesh Puttur <aputtur@redhat.com>
Signed-off-by: Aneesh Puttur <aputtur@redhat.com>
Fixed the following issues:
When an event is received with an iface not found in the stored
in-memory data, the whole Data is re-created before adding DataDetails
for this event and DataDetails for other ifaces are wiped out. As a
result, there is only one iface event data is stored in-memory at any
given time and the GM State calculation is only based on this one iface
instead of multiple ifaces.

Another issue is the event data for dpll is stored using iface alias,
while event data for gnss is stored using iface name, resulting same
interface having multiple entries in in-memory data.

Signed-off-by: Jack Ding <jackding@gmail.com>
Signed-off-by: Aneesh Puttur <aputtur@redhat.com>
…ulable

Signed-off-by: Aneesh Puttur <aputtur@redhat.com>
Signed-off-by: Jack Ding <jackding@gmail.com>
@jzding jzding changed the title [release-4.14] Backport 2 WPC Cards [release-4.14] OCPBUGS-26238: Backport 2 WPC Cards Jan 11, 2024
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Jan 11, 2024
@openshift-ci-robot
Copy link
Contributor

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

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.14.z) matches configured target version for branch (4.14.z)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-26501 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-26501 targets the "4.15.0" version, which is one of the valid target versions: 4.15.0
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (bblock@redhat.com), skipping review request.

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

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link
Contributor

@jzding: This pull request references Jira Issue OCPBUGS-26238, which is valid.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.14.z) matches configured target version for branch (4.14.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-26501 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-26501 targets the "4.15.0" version, which is one of the valid target versions: 4.15.0
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (bblock@redhat.com), skipping review request.

In response to this:

This backport includes the following PRs from release-4.15:

#230
OCPBUGS-20514: PTP HW Clock Class after disabling NMEA sentences set to FREERUN

#235
Add iface details for multiple cards

#234
dual ts2phc /dpll support for multi card T-GM

#236
get hardware clockId for each DPLL

#237
Fix PtpSettings nil-pointer

#240
get PhcId from ethtool

#238
Add DPLL event subscription for multiple cards

#242
OCPBUGS-24043: nmea_status and clock_class metrics missing in 4.14 linuxptpdaemon

#245 (empty, content already in).
OCPBUGS-24010: fixup node profile access from plugin

#243
Fix master metrics interface names

#244
Bug OCPBUGS-24304: GM clock state stays locked when 1PPS lost

#255
[release-4.15] OCPBUGS-26070: T-GM ts2phc IERS Bulletin expired December the 28thupdate leap file to june 2024

#261
[release-4.15] OCPBUGS-26505: False GM process with unknown interface appears after node reboot

#262
Add unit tests for metrics and events

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

Copy link
Contributor

openshift-ci bot commented Jan 11, 2024

@jzding: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@josephdrichard
Copy link
Contributor

/lgtm
/approved
/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Jan 17, 2024
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 17, 2024
Copy link
Contributor

openshift-ci bot commented Jan 17, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: josephdrichard, jzding

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:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 17, 2024
@Bonnie-Block
Copy link

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jan 18, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit e071329 into openshift:release-4.14 Jan 18, 2024
5 checks passed
@openshift-ci-robot
Copy link
Contributor

@jzding: Jira Issue OCPBUGS-26238: All pull requests linked via external trackers have merged:

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

In response to this:

This backport includes the following PRs from release-4.15:

#230
OCPBUGS-20514: PTP HW Clock Class after disabling NMEA sentences set to FREERUN

#235
Add iface details for multiple cards

#234
dual ts2phc /dpll support for multi card T-GM

#236
get hardware clockId for each DPLL

#237
Fix PtpSettings nil-pointer

#240
get PhcId from ethtool

#238
Add DPLL event subscription for multiple cards

#242
OCPBUGS-24043: nmea_status and clock_class metrics missing in 4.14 linuxptpdaemon

#245 (empty, content already in).
OCPBUGS-24010: fixup node profile access from plugin

#243
Fix master metrics interface names

#244
Bug OCPBUGS-24304: GM clock state stays locked when 1PPS lost

#255
[release-4.15] OCPBUGS-26070: T-GM ts2phc IERS Bulletin expired December the 28thupdate leap file to june 2024

#261
[release-4.15] OCPBUGS-26505: False GM process with unknown interface appears after node reboot

#262
Add unit tests for metrics and events

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-linuxptp-daemon-container-v4.14.0-202401190511.p0.ge071329.assembly.stream for distgit linuxptp-daemon.
All builds following this will include this PR.

@jzding jzding deleted the 2card-4.14 branch March 12, 2024 15:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet