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.

Sign up for GitHub

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

Jump to bottom

[release-4.13] OCPBUGS-23014: Netpol retryFramework cleanup #1957

Merged
merged 3 commits into from Dec 7, 2023
Merged

[release-4.13] OCPBUGS-23014: Netpol retryFramework cleanup #1957

merged 3 commits into from Dec 7, 2023

Conversation

npinaeva
Copy link
Member

Upstream: ovn-org/ovn-kubernetes#3703 + ovn-org/ovn-kubernetes@30f005f#diff-0b82ad568a45217e5458d7e3153a8ad9550d662bc639137bb265cefb0d440b45
was done as a part of 4.14 development.

had some merge conflicts, requires a review.

npinaeva and others added 3 commits November 20, 2023 12:17
@npinaeva
podSelectorAddressSet: fix deleting namespaceHandler.
46a6174 
namespace and pod handlers need different commands to be
cleaned up. we used to call RemovePodHandler for both namespace
and pod handlers

Signed-off-by: Nadia Pinaeva <npinaeva@redhat.com>
(cherry picked from commit ef362a8)
@npinaeva
netpolEventHandler: fix stopChan.
971b2bc 
We used to pass oc.stopChan to the retryFramework for
network policy handlers, but that means that retry loop
for failed objects will not be stopped on network policy
delete, therefore leaking goroutines.
Create getChildStopChan function to pass stop signal both
on oc and network policy delete.

Signed-off-by: Nadia Pinaeva <npinaeva@redhat.com>
(cherry picked from commit 5d6b136)

Conflicts:
	go-controller/pkg/ovn/network_controller_policy_event_handler.go
	go-controller/pkg/ovn/pod_selector_address_set.go
	go-controller/pkg/ovn/pod_selector_address_set_test.go
	go-controller/pkg/ovn/policy.go

apply base_network_controller_policy.go changes to policy.go.
newNetpolRetryFramework doesn't exist, create
newRetryFrameworkWithParametersAndStopChan instead
@jcaamano @npinaeva
Replace child stop channels with cancelable contexts
7295be0 
Commit 5d6b136 added child stop channels to stop the network policy
handlers independently from the network controller when the policy is
deleted while also stopping them if the network controller is stopped.

Unfortunately when both things happen at the same time, one of those
events will end up attempting to close a closed channel which will panic.

Introduce a CancelableContext utility that will wrap a cancelable context
that can be chained to achieve the same effect.

Signed-off-by: Jaime Caamaño Ruiz <jcaamano@redhat.com>
(cherry picked from commit 30f005f)

Conflicts:
	go-controller/pkg/ovn/base_network_controller.go
	go-controller/pkg/ovn/default_network_controller.go
	go-controller/pkg/ovn/pod_selector_address_set.go
	go-controller/pkg/ovn/policy.go
	go-controller/pkg/ovn/secondary_layer2_network_controller.go
	go-controller/pkg/ovn/secondary_layer3_network_controller.go
	go-controller/pkg/util/sync.go

Simple conflict to merge non-exsiitng in 4.13  fields
@openshift-ci-robot openshift-ci-robot added 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 Nov 20, 2023
@openshift-ci-robot
Copy link
Contributor

@npinaeva: This pull request references Jira Issue OCPBUGS-23014, which is invalid:

  • expected the bug to target the "4.13.z" version, but no target version was set
  • expected Jira Issue OCPBUGS-23014 to depend on a bug targeting a version in 4.14.0, 4.14.z and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

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:

Upstream: ovn-org/ovn-kubernetes#3703 + ovn-org/ovn-kubernetes@30f005f#diff-0b82ad568a45217e5458d7e3153a8ad9550d662bc639137bb265cefb0d440b45
was done as a part of 4.14 development.

had some merge conflicts, requires a review.

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.

@openshift-ci openshift-ci bot requested review from abhat and dcbw November 20, 2023 14:20
@npinaeva
Copy link
Member Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Nov 27, 2023
@openshift-ci-robot
Copy link
Contributor

@npinaeva: This pull request references Jira Issue OCPBUGS-23014, which is valid.

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

Requesting review from QA contact:
/cc @anuragthehatter

In response to this:

/jira refresh

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.

@openshift-ci-robot openshift-ci-robot removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Nov 27, 2023
@npinaeva
Copy link
Member Author

npinaeva commented Dec 1, 2023

/retest-required

@jcaamano
Copy link
Contributor

jcaamano commented Dec 1, 2023

/lgtm
/approve
/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 Dec 1, 2023
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 1, 2023
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Dec 1, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jcaamano, npinaeva

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 Dec 1, 2023
@asood-rh
Copy link

asood-rh commented Dec 1, 2023

/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 Dec 1, 2023
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD cfe89e5 and 2 for PR HEAD 7295be0 in total

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD bc1c4dc and 1 for PR HEAD 7295be0 in total

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Dec 1, 2023 •
edited

@npinaeva: 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-vsphere-ovn 7295be0 link false /test e2e-vsphere-ovn
ci/prow/security 7295be0 link false /test security

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.

@npinaeva
Copy link
Member Author

npinaeva commented Dec 7, 2023

/retest-required

@openshift-merge-bot openshift-merge-bot bot merged commit 81e7ebc into openshift:release-4.13 Dec 7, 2023
25 of 27 checks passed
@openshift-ci-robot
Copy link
Contributor

@npinaeva: Jira Issue OCPBUGS-23014: All pull requests linked via external trackers have merged:

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

In response to this:

Upstream: ovn-org/ovn-kubernetes#3703 + ovn-org/ovn-kubernetes@30f005f#diff-0b82ad568a45217e5458d7e3153a8ad9550d662bc639137bb265cefb0d440b45
was done as a part of 4.14 development.

had some merge conflicts, requires a review.

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.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-ovn-kubernetes-base-container-v4.13.0-202312071433.p0.g81e7ebc.assembly.stream for distgit ovn-kubernetes-base.
All builds following this will include this PR.

@npinaeva npinaeva deleted the netpol-stop-chan branch December 7, 2023 17:21
@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.13.0-0.nightly-2023-12-07-160307

@npinaeva npinaeva mentioned this pull request Dec 8, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@abhat abhat Awaiting requested review from abhat

@dcbw dcbw Awaiting requested review from dcbw

@anuragthehatter anuragthehatter Awaiting requested review from anuragthehatter

Assignees

@mffiedler mffiedler

@rbbratta rbbratta

@zhaozhanqi zhaozhanqi

@weliang1 weliang1

@anuragthehatter anuragthehatter

@huiran0826 huiran0826

@asood-rh asood-rh

@jechen0648 jechen0648

@yingwang-0320 yingwang-0320

@qiowang721 qiowang721

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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet