Skip to content

[release-4.15] OCPBUGS-48662: Fix concurrent namespace resolution#948

Merged
openshift-merge-bot[bot] merged 4 commits intoopenshift:release-4.15from
perdasilva:workqueue-fix-415
Mar 19, 2025
Merged

[release-4.15] OCPBUGS-48662: Fix concurrent namespace resolution#948
openshift-merge-bot[bot] merged 4 commits intoopenshift:release-4.15from
perdasilva:workqueue-fix-415

Conversation

@perdasilva
Copy link
Copy Markdown
Contributor

This is a manual cherry-pick of #947

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jan 21, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: perdasilva

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:

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 Jan 21, 2025
@perdasilva perdasilva changed the title [release-4.15] OCPBUGS-XXXXX: Fix concurrent namespace resolution [release-4.15] OCPBUGS-48662: Fix concurrent namespace resolution Jan 21, 2025
@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important 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 21, 2025
@openshift-ci-robot
Copy link
Copy Markdown

@perdasilva: This pull request references Jira Issue OCPBUGS-48662, which is invalid:

  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
  • expected dependent Jira Issue OCPBUGS-48661 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is New instead

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.

Details

In response to this:

This is a manual cherry-pick of #947

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.

@perdasilva
Copy link
Copy Markdown
Contributor Author

/jira refresh

@openshift-ci-robot
Copy link
Copy Markdown

@perdasilva: This pull request references Jira Issue OCPBUGS-48662, which is invalid:

  • expected dependent Jira Issue OCPBUGS-48661 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is New instead

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.

Details

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 openshift-eng/jira-lifecycle-plugin repository.

@perdasilva perdasilva force-pushed the workqueue-fix-415 branch 3 times, most recently from 35348d9 to 0573f8c Compare January 21, 2025 16:43
@perdasilva perdasilva changed the title [release-4.15] OCPBUGS-48662: Fix concurrent namespace resolution [WIP][release-4.15] OCPBUGS-48662: Fix concurrent namespace resolution Jan 21, 2025
@openshift-ci openshift-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 21, 2025
@perdasilva
Copy link
Copy Markdown
Contributor Author

/retest

1 similar comment
@perdasilva
Copy link
Copy Markdown
Contributor Author

/retest

@kuiwang02
Copy link
Copy Markdown
Contributor

/label cherry-pick-approved
/label qe-approved

@openshift-ci openshift-ci Bot added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. qe-approved Signifies that QE has signed off on this PR labels Jan 22, 2025
@openshift-ci-robot
Copy link
Copy Markdown

@perdasilva: This pull request references Jira Issue OCPBUGS-48662, which is invalid:

  • expected dependent Jira Issue OCPBUGS-48661 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is MODIFIED instead

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.

Details

In response to this:

This is a manual cherry-pick of #947

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.

@perdasilva
Copy link
Copy Markdown
Contributor Author

/retest

@perdasilva
Copy link
Copy Markdown
Contributor Author

/jira refresh

@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 22, 2025
@openshift-ci-robot
Copy link
Copy Markdown

@perdasilva: This pull request references Jira Issue OCPBUGS-48662, which is valid.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.z) matches configured target version for branch (4.15.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-48661 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-48661 targets the "4.16.z" version, which is one of the valid target versions: 4.16.0, 4.16.z
  • bug has dependents

Requesting review from QA contact:
/cc @kuiwang02

Details

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci Bot requested a review from kuiwang02 January 22, 2025 13:43
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 23, 2025
tmshort and others added 4 commits January 29, 2025 10:20
Remove old CSV cleanup code
Cleanup CRB/CR/MWC/VWC via finalizer.

Signed-off-by: Todd Short <todd.short@me.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: f94a5edc69027aefc2f902d6b16cb849b9e18f0a
…n handler (#3483)

* switch queue informer to use types.NamespacedName; relocate deletion handler

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>

* Add error message to object count assertion failure

Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>

---------

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>
Co-authored-by: Per Goncalves da Silva <pegoncal@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: edb751b9718ffe29e8462ce17867ec3db3b349ff
Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>
Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 29, 2025
@perdasilva
Copy link
Copy Markdown
Contributor Author

/retest

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jan 29, 2025

@perdasilva: all tests passed!

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

@perdasilva perdasilva changed the title [WIP][release-4.15] OCPBUGS-48662: Fix concurrent namespace resolution [release-4.15] OCPBUGS-48662: Fix concurrent namespace resolution Mar 10, 2025
@openshift-ci openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 10, 2025
queueinformer.WithLogger(op.logger),
queueinformer.WithInformer(opConditionInformer.Informer()),
queueinformer.WithSyncer(k8sSyncer),
queueinformer.WithDeletionHandler(op.handleDeletion),
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Is this a net-new DeletionHandler for the OperatorCondition queue informer? If so, why?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Seeing this on other queue informer setups as well. I'll keep reading :)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Found it. The deletion handler is requeueing the owner or depending CSVs.

@joelanford
Copy link
Copy Markdown
Member

/label backport-risk-assessed
/lgtm

@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 Mar 19, 2025
@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Mar 19, 2025
@openshift-merge-bot openshift-merge-bot Bot merged commit 7788801 into openshift:release-4.15 Mar 19, 2025
@openshift-ci-robot
Copy link
Copy Markdown

@perdasilva: Jira Issue OCPBUGS-48662: All pull requests linked via external trackers have merged:

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

Details

In response to this:

This is a manual cherry-pick of #947

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
Copy Markdown
Contributor

[ART PR BUILD NOTIFIER]

Distgit: operator-registry
This PR has been included in build operator-registry-container-v4.15.0-202503191405.p0.g7788801.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link
Copy Markdown
Contributor

[ART PR BUILD NOTIFIER]

Distgit: operator-lifecycle-manager
This PR has been included in build operator-lifecycle-manager-container-v4.15.0-202503191405.p0.g7788801.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

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/severity-important Referenced Jira bug's severity is important 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. qe-approved Signifies that QE has signed off on this PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.