[release-4.11] OCPBUGS-4167: EgressIP: Merge ops into pendingCloudPrivateIPConfigsOps on add #1404
Conversation
Merge the add op into the existing map but only execute new operations. Up until now, the Cloud Private IP Conf add operation unconditionally overwrote the current entry in pendingCloudPrivateIPConfigsOps for the egressIPName. This lead to race conditions when updating an EgressIP's IP address to a different one. During such a simultaneous CloudPrivateIP add and remove operation, the add could overwrite the map entry before the remove had the time to remove its own op. The delete operation would be rescheduled and log an error until the reschedule was killed off. Signed-off-by: Andreas Karis <ak.karis@gmail.com> Reported-at: https://bugzilla.redhat.com/show_bug.cgi?id=2105706 (cherry picked from commit e16d3e5)
Do not throw an error when the cache contains a delete operation for an IsNotFound API object. Instead, log an Info and go on with the business logic. The desired state is already == the current state, so there is no reason to throw an error and retry in such a scenario. Signed-off-by: Andreas Karis <ak.karis@gmail.com> (cherry picked from commit 3d69f04)
openshift-ci-robot
added
jira/severity-important
|
@andreaskaris: This pull request references Jira Issue OCPBUGS-4167, which is valid. 6 validation(s) were run on this bug
Requesting review from QA contact: 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 kubernetes/test-infra repository. |
|
@andreaskaris: No Bugzilla bug is referenced in the title of this pull request. Retaining the bugzilla/valid-bug label as it was manually added. 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 kubernetes/test-infra repository. |
|
/jira refresh |
|
@andreaskaris: This pull request references Jira Issue OCPBUGS-4167, which is valid. 8 validation(s) were run on this bug
Requesting review from QA contact: 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 kubernetes/test-infra repository. |
|
/lgtm |
|
/retest |
|
/retest-required |
|
/retest |
|
/approve |
openshift-ci
bot
added
the
backport-risk-assessed
openshift-ci
bot
assigned anuragthehatter, asood-rh, huiran0826, jechen0648, mffiedler, qiowang721, rbbratta, weliang1 and yingwang-0320
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: andreaskaris, jcaamano, kyrtapz 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 |
openshift-ci
bot
added
the
approved
|
/label cherry-pick-approved |
openshift-ci
bot
added
the
cherry-pick-approved
|
@andreaskaris: The following tests failed, say
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. |
|
/retest-required |
|
@andreaskaris: All pull requests linked via external trackers have merged: Jira Issue OCPBUGS-4167 has been moved to the MODIFIED state. 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 kubernetes/test-infra repository. |
Missing backports, clean cherry-picks without conflicts