OCPBUGS-11109: [release-4.12] Batch potentially big transaction on egress firewall ACLs migration by npinaeva · Pull Request #1617 · openshift/ovn-kubernetes

npinaeva · 2023-03-30T07:46:10Z

cherry-pick of #1604
Conflict: egressfirewall.go - update apimachinery.sets to the previous
version

The default transaction timeout is 10 seconds, it can be reached when we delete all egress firewall acls during migration to port groups from switches. Signed-off-by: Nadia Pinaeva <npinaeva@redhat.com> (cherry picked from commit 1896e16) (cherry picked from commit 7fb527e)

openshift-ci · 2023-03-30T07:46:14Z

@npinaeva: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

Details

In response to this:

OCPBUGS-11109: [release-4.12] Batch potentially big transaction on egress firewall ACLs migration

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 · 2023-03-30T07:46:20Z

@npinaeva: This pull request references Jira Issue OCPBUGS-11109, 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.12.z) matches configured target version for branch (4.12.z)
bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
dependent bug Jira Issue OCPBUGS-10801 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE))
dependent Jira Issue OCPBUGS-10801 targets the "4.13.0" version, which is one of the valid target versions: 4.13.0
bug has dependents

Requesting review from QA contact:
/cc @huiran0826

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

Details

In response to this:

cherry-pick of #1604
the only conflict was in imports

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.

stale acls. Signed-off-by: Nadia Pinaeva <npinaeva@redhat.com> (cherry picked from commit 81acdc2) (cherry picked from commit 34eb562) Conflict; egressfirewall.go - update apimachinery.sets to the previous version

openshift-ci-robot · 2023-03-31T11:14:23Z

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

6 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.12.z) matches configured target version for branch (4.12.z)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
dependent bug Jira Issue OCPBUGS-10801 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE))
dependent Jira Issue OCPBUGS-10801 targets the "4.13.0" version, which is one of the valid target versions: 4.13.0
bug has dependents

Requesting review from QA contact:
/cc @huiran0826

Details

In response to this:

cherry-pick of #1604
Conflict: egressfirewall.go - update apimachinery.sets to the previous
version

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.

npinaeva · 2023-03-31T11:14:34Z

/retest-required

openshift-ci · 2023-03-31T11:15:20Z

@npinaeva: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

Retaining the bugzilla/valid-bug label as it was manually added.

Details

In response to this:

OCPBUGS-11109: [release-4.12] Batch potentially big transaction on egress firewall ACLs migration

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.

trozet

/lgtm

trozet · 2023-03-31T18:13:36Z

/label backport-risk-assessed

openshift-ci · 2023-03-31T18:13:54Z

[APPROVALNOTIFIER] This PR is APPROVED

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

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [trozet]

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

jechen0648 · 2023-03-31T18:46:15Z

/label cherry-pick-approved

openshift-ci-robot · 2023-03-31T19:45:44Z

/retest-required

Remaining retests: 0 against base HEAD ffce71c and 2 for PR HEAD 0bc8f14 in total

huiran0826 · 2023-04-03T10:34:57Z

/label qe-approved

npinaeva · 2023-04-03T15:17:35Z

/retest-required

openshift-ci · 2023-04-03T15:31:33Z

@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-azure-ovn	`0bc8f14`	link	false	`/test e2e-azure-ovn`
ci/prow/e2e-vsphere-ovn	`0bc8f14`	link	false	`/test e2e-vsphere-ovn`
ci/prow/e2e-ovn-hybrid-step-registry	`0bc8f14`	link	false	`/test e2e-ovn-hybrid-step-registry`
ci/prow/e2e-openstack-ovn	`0bc8f14`	link	false	`/test e2e-openstack-ovn`

Full PR test history. Your PR dashboard.

Details

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 · 2023-04-04T07:26:39Z

/retest-required

openshift-ci-robot · 2023-04-04T10:54:05Z

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

openshift/ovn-kubernetes#1617

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

Details

In response to this:

cherry-pick of #1604
Conflict: egressfirewall.go - update apimachinery.sets to the previous
version

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.

npinaeva · 2023-04-05T20:03:38Z

/cherry-pick release-4.11

openshift-cherrypick-robot · 2023-04-05T20:04:15Z

@npinaeva: #1617 failed to apply on top of branch "release-4.11":

Applying: Batch potentially big transaction on egress firewall ACLs migration. The default transaction timeout is 10 seconds, it can be reached when we delete all egress firewall acls during migration to port groups from switches.
Using index info to reconstruct a base tree...
M	go-controller/pkg/ovn/egressfirewall.go
Falling back to patching base and 3-way merge...
Auto-merging go-controller/pkg/ovn/egressfirewall.go
CONFLICT (content): Merge conflict in go-controller/pkg/ovn/egressfirewall.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Batch potentially big transaction on egress firewall ACLs migration. The default transaction timeout is 10 seconds, it can be reached when we delete all egress firewall acls during migration to port groups from switches.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherry-pick release-4.11

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 bot requested review from huiran0826, trozet and tssurya March 30, 2023 07:46

Optimize egress firewall cleanup to only select switches that have

0bc8f14

stale acls. Signed-off-by: Nadia Pinaeva <npinaeva@redhat.com> (cherry picked from commit 81acdc2) (cherry picked from commit 34eb562) Conflict; egressfirewall.go - update apimachinery.sets to the previous version

npinaeva force-pushed the ocpbugs-11109 branch from 87bbc05 to 0bc8f14 Compare March 30, 2023 16:38

trozet approved these changes Mar 31, 2023

View reviewed changes

openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Mar 31, 2023

openshift-ci bot assigned anuragthehatter, asood-rh, huiran0826, jechen0648, mffiedler, qiowang721, rbbratta, weliang1, yingwang-0320 and zhaozhanqi Mar 31, 2023

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 31, 2023

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 31, 2023

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 Mar 31, 2023

openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Apr 3, 2023

openshift-merge-robot merged commit 3780f16 into openshift:release-4.12 Apr 4, 2023

npinaeva deleted the ocpbugs-11109 branch April 4, 2023 13:02

npinaeva mentioned this pull request Apr 5, 2023

OCPBUGS-11110: [release-4.11] Batch potentially big transaction on egress firewall ACLs migration #1629

Merged

Conversation

npinaeva commented Mar 30, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci bot commented Mar 30, 2023

Uh oh!

openshift-ci-robot commented Mar 30, 2023

Uh oh!

openshift-ci-robot commented Mar 31, 2023

Uh oh!

npinaeva commented Mar 31, 2023

Uh oh!

openshift-ci bot commented Mar 31, 2023

Uh oh!

trozet left a comment

Choose a reason for hiding this comment

Uh oh!

trozet commented Mar 31, 2023

Uh oh!

openshift-ci bot commented Mar 31, 2023

Uh oh!

jechen0648 commented Mar 31, 2023

Uh oh!

openshift-ci-robot commented Mar 31, 2023

Uh oh!

huiran0826 commented Apr 3, 2023

Uh oh!

npinaeva commented Apr 3, 2023

Uh oh!

openshift-ci bot commented Apr 3, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

npinaeva commented Apr 4, 2023

Uh oh!

openshift-ci-robot commented Apr 4, 2023

Uh oh!

npinaeva commented Apr 5, 2023

Uh oh!

openshift-cherrypick-robot commented Apr 5, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

15 participants

npinaeva commented Mar 30, 2023 •

edited

Loading

openshift-ci bot commented Apr 3, 2023 •

edited

Loading