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

OCPBUGS-33894: Avoid dumping Go struct in potentially user-facing reason annotation #4814

Merged
merged 1 commit into from
Feb 14, 2025

Conversation

djoshy
Copy link
Contributor

@djoshy djoshy commented Jan 28, 2025

- What I did

  • Use nodeName instead of node in error message for setting node annotations. On a degraded node, such an error would result in the entire node object to be dumped in the node's annotation which was not user friendly.
  • I also changed retry mechanism to use a backoff of retry.DefaultRetry, instead of retry.DefaultBackoff which is recommended for conflicts.

- How to verify it

  • Reading through the bug, this seems to surface during upgrades/installs when the APIServer goes unavailable/nodes have high activity. It may be useful to simulate such conditions and see if the errors resurface.
  • I suppose one could also explore ways to make the API update calls from the MCO to fail to simulate a retry error scenario.

@openshift-ci-robot openshift-ci-robot added jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jan 28, 2025
@openshift-ci-robot
Copy link
Contributor

@djoshy: This pull request references Jira Issue OCPBUGS-33894, which is invalid:

  • expected the bug to target the "4.19.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

In response to this:

- What I did

  • Use nodeName instead of node in error message for setting node annotations. On a degraded node, such an error would result in be stored in the node's annotation which was not user friendly.
  • I also changed retry mechanism to use a backoff of retry.DefaultRetry, instead of retry.DefaultBackoff which is recommended for conflicts.

- How to verify it

  • Reading through the bug, this seems to surface during upgrades/installs when the APIServer goes unavailable/nodes have high activity. It may be useful to simulate such conditions and see if the errors resurface.
  • I suppose one could also explore ways to make the API update calls from the MCO to fail to simulate a retry error scenario.

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 openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 28, 2025
@djoshy
Copy link
Contributor Author

djoshy commented Jan 28, 2025

/jira refresh

This may potentially alleviate https://issues.redhat.com/browse/OCPBUGS-33891, but I am unsure at this time

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jan 28, 2025
@openshift-ci-robot
Copy link
Contributor

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

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.19.0) matches configured target version for branch (4.19.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @sergiordlr

In response to this:

/jira refresh

This may potentially alleviate https://issues.redhat.com/browse/OCPBUGS-33891, but I am unsure at this time

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 openshift-ci bot requested a review from sergiordlr January 28, 2025 17:55
Copy link
Contributor

openshift-ci bot commented Jan 28, 2025

@djoshy: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-azure-ovn-upgrade-out-of-change fb86e86 link false /test e2e-azure-ovn-upgrade-out-of-change
ci/prow/okd-scos-e2e-aws-ovn fb86e86 link false /test okd-scos-e2e-aws-ovn
ci/prow/bootstrap-unit fb86e86 link false /test bootstrap-unit

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-sigs/prow repository. I understand the commands that are listed here.

@openshift-ci-robot
Copy link
Contributor

@djoshy: This pull request references Jira Issue OCPBUGS-33894, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.19.0) matches configured target version for branch (4.19.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @sergiordlr

In response to this:

- What I did

  • Use nodeName instead of node in error message for setting node annotations. On a degraded node, such an error would result in the entire node object to be dumped in the node's annotation which was not user friendly.
  • I also changed retry mechanism to use a backoff of retry.DefaultRetry, instead of retry.DefaultBackoff which is recommended for conflicts.

- How to verify it

  • Reading through the bug, this seems to surface during upgrades/installs when the APIServer goes unavailable/nodes have high activity. It may be useful to simulate such conditions and see if the errors resurface.
  • I suppose one could also explore ways to make the API update calls from the MCO to fail to simulate a retry error scenario.

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
Member

@isabella-janssen isabella-janssen left a comment

Choose a reason for hiding this comment

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

/hold
Holding for qe if it is needed @djoshy

/lgtm

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 3, 2025
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 3, 2025
Copy link
Contributor

openshift-ci bot commented Feb 3, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: djoshy, isabella-janssen

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

@djoshy
Copy link
Contributor Author

djoshy commented Feb 14, 2025

Chatted with @sergiordlr and we think this won't need pre merge QE testing

/unhold

/label acknowledge-critical-fixes-only

This is a minor change to error text and a retry mechanism; shouldn't affect payloads.

@openshift-ci openshift-ci bot added acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Feb 14, 2025
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 0afa42b and 2 for PR HEAD fb86e86 in total

@openshift-merge-bot openshift-merge-bot bot merged commit c26bdb0 into openshift:master Feb 14, 2025
17 of 20 checks passed
@openshift-ci-robot
Copy link
Contributor

@djoshy: Jira Issue OCPBUGS-33894: All pull requests linked via external trackers have merged:

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

In response to this:

- What I did

  • Use nodeName instead of node in error message for setting node annotations. On a degraded node, such an error would result in the entire node object to be dumped in the node's annotation which was not user friendly.
  • I also changed retry mechanism to use a backoff of retry.DefaultRetry, instead of retry.DefaultBackoff which is recommended for conflicts.

- How to verify it

  • Reading through the bug, this seems to surface during upgrades/installs when the APIServer goes unavailable/nodes have high activity. It may be useful to simulate such conditions and see if the errors resurface.
  • I suppose one could also explore ways to make the API update calls from the MCO to fail to simulate a retry error scenario.

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]

Distgit: ose-machine-config-operator
This PR has been included in build ose-machine-config-operator-container-v4.19.0-202502150007.p0.gc26bdb0.assembly.stream.el9.
All builds following this will include this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. 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.

4 participants