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

Bug 1939726: Enclose ApplyObject on RetryOnConflict #1056

Conversation

rcarrillocruz
Copy link
Contributor

This prevents the operator to flip flop on Degraded state
if there is a concurrent update by other external actor.

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 13, 2021
@rcarrillocruz
Copy link
Contributor Author

/retest

1 similar comment
@rcarrillocruz
Copy link
Contributor Author

/retest

@rcarrillocruz rcarrillocruz changed the title Enclose the Apply on RetryOnConflict Bug 1939726: Enclose ApplyObject on RetryOnConflict Apr 13, 2021
@openshift-ci-robot openshift-ci-robot added bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Apr 13, 2021
@openshift-ci-robot
Copy link
Contributor

@rcarrillocruz: This pull request references Bugzilla bug 1939726, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

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

Requesting review from QA contact:
/cc @zhaozhanqi

In response to this:

Bug 1939726: Enclose ApplyObject on RetryOnConflict

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.

@rcarrillocruz
Copy link
Contributor Author

/retest

1 similar comment
@dcbw
Copy link
Member

dcbw commented Apr 18, 2021

/retest

@rcarrillocruz
Copy link
Contributor Author

/assign @danwinship

@danwinship
Copy link
Contributor

/cc @squeed

In theory we don't do this because CNO will always try to reconcile it again later anyway. Though we should do that without going degraded at least...

I think this change should be fine?

@rcarrillocruz
Copy link
Contributor Author

Yeah, but with the patch I do not see the blip of going Degraded, then reconciling and changing status again, which is what @smarterclayton referred to in the BZ as I understand it.


return nil
return err
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you wrap the error here with something a bit more descriptive?

@squeed
Copy link
Contributor

squeed commented Apr 20, 2021

seems reasonable. There are probably a few places we update objects directly - it would be worthwhile to grep for .Update( and see if there are any other unwrapped ones.

This prevents the operator to flip flop on Degraded state
if there is a concurrent update by other external actor.
@rcarrillocruz rcarrillocruz force-pushed the enclose_apply_on_retry_on_conflict branch from f652055 to 30eb900 Compare April 21, 2021 08:27
@rcarrillocruz
Copy link
Contributor Author

/retest

2 similar comments
@rcarrillocruz
Copy link
Contributor Author

/retest

@rcarrillocruz
Copy link
Contributor Author

/retest

@abhat
Copy link
Contributor

abhat commented May 3, 2021

/test e2e-gcp-ovn
/test e2e-agnostic-upgrade

@squeed
Copy link
Contributor

squeed commented May 3, 2021

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label May 3, 2021
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rcarrillocruz, squeed

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 [rcarrillocruz,squeed]

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

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

26 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 6, 2021

@rcarrillocruz: The following tests failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/e2e-gcp-ovn-upgrade 30eb900 link /test e2e-gcp-ovn-upgrade
ci/prow/e2e-openstack-ovn 30eb900 link /test e2e-openstack-ovn

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.

@openshift-merge-robot openshift-merge-robot merged commit 1f5658b into openshift:master May 6, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 6, 2021

@rcarrillocruz: All pull requests linked via external trackers have merged:

Bugzilla bug 1939726 has been moved to the MODIFIED state.

In response to this:

Bug 1939726: Enclose ApplyObject on RetryOnConflict

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.

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. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. 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

8 participants