OCPBUGS-48486: Fix concurrent namespace resolution by perdasilva · Pull Request #936 · openshift/operator-framework-olm

perdasilva · 2025-01-16T10:36:22Z

No description provided.

…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>

perdasilva · 2025-01-16T11:18:23Z

/jira refresh

openshift-ci-robot · 2025-01-16T11:18:30Z

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

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.19.0) matches configured target version for branch (4.19.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @kuiwang02

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

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 · 2025-01-16T12:49:17Z

/retest

perdasilva · 2025-01-16T14:31:30Z

/retest

perdasilva · 2025-01-16T15:31:41Z

/retest

perdasilva · 2025-01-16T16:23:15Z

/retest

perdasilva · 2025-01-16T17:00:05Z

/retest

kuiwang02 · 2025-01-17T01:59:41Z

@perdasilva Hi, what is the different between this PR and #929 ?
Thanks

perdasilva · 2025-01-17T08:49:10Z

/retest

perdasilva · 2025-01-17T10:54:46Z

/retest

perdasilva · 2025-01-17T11:04:33Z

@perdasilva Hi, what is the different between this PR and #929 ? Thanks

@kuiwang02 there shouldn't be any differences. The reason I'm not using that one is that I just side-loaded the upstream PR (which hadn't merged yet) for your testing. After you gave your approval, we felt comfortable merging upstream, and this is us downstreaming it now =D I think it would be ok to do do a lite verification. Assuming CI goes through =S

btw - thanks again for doing that for us! it really made us feel more comfortable merging it!!

perdasilva · 2025-01-17T15:49:14Z

/retest

tmshort · 2025-01-17T20:04:14Z

@perdasilva the upstream PR operator-framework/operator-lifecycle-manager#3483 has been merged.
PR #937 has upstream PR3483 as the first commit, but it is failing.
Why are we not able to use #937 as-is (via the bumper)? Why do we have to modify the vendor directory?

I'm concerned this will bite us in the future.

@joelanford since this is a downstream of your PR, can you verify it looks correct?

tmshort · 2025-01-17T20:05:28Z

/hold

perdasilva · 2025-01-20T07:42:11Z

@tmshort I mentioned it in the auto sync PR. We cannot bring it down because it requires downstream changes. The fix for the concurrent namespace resolution makes changes to the workqueues. We have some downstream only reconcilers. Merging this will clear up the auto sync.

Here's the downstream only commit. It would also be possible to just cherry pick this commit into another downsync. But, I really want to get this down and start on the backporting to free up SRE.

perdasilva · 2025-01-20T12:54:02Z

/cherry-pick release-4.17

openshift-cherrypick-robot · 2025-01-20T12:54:06Z

@perdasilva: once the present PR merges, I will cherry-pick it on top of release-4.17 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-4.17

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.

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

tmshort · 2025-01-20T16:19:24Z

/unhold

tmshort

/lgtm
/approve

openshift-ci · 2025-01-20T16:46:28Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: perdasilva, tmshort

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:

~~DOWNSTREAM_OWNERS~~ [perdasilva,tmshort]

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

perdasilva · 2025-01-20T16:54:58Z

/retest

oceanc80 · 2025-01-20T17:51:30Z

/label acknowledge-critical-fixes-only

openshift-ci · 2025-01-20T19:14:17Z

@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.

openshift-ci-robot · 2025-01-20T19:18:33Z

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

openshift/operator-framework-olm#936

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

Details

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

openshift-cherrypick-robot · 2025-01-20T19:19:16Z

@perdasilva: #936 failed to apply on top of branch "release-4.17":

Applying: bug: Switch queue informer to use types.Namespace name; relocate deletion handler (#3483)
Using index info to reconstruct a base tree...
M	staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go
M	staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator_test.go
M	staging/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/config.go
M	staging/operator-lifecycle-manager/pkg/controller/operators/catalogtemplate/operator.go
M	staging/operator-lifecycle-manager/pkg/controller/operators/olm/operator.go
M	staging/operator-lifecycle-manager/pkg/controller/operators/olm/operatorgroup.go
M	staging/operator-lifecycle-manager/pkg/lib/queueinformer/config.go
M	staging/operator-lifecycle-manager/pkg/package-server/server/server.go
M	staging/operator-lifecycle-manager/test/e2e/operator_groups_e2e_test.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/config.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalogtemplate/operator.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/olm/operator.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/olm/operatorgroup.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/lib/queueinformer/config.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/package-server/server/server.go
Falling back to patching base and 3-way merge...
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/package-server/server/server.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/package-server/server/server.go
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/lib/queueinformer/config.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/lib/queueinformer/config.go
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/olm/operatorgroup.go
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/olm/operator.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/olm/operator.go
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalogtemplate/operator.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalogtemplate/operator.go
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/config.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/config.go
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go
Auto-merging staging/operator-lifecycle-manager/test/e2e/operator_groups_e2e_test.go
Auto-merging staging/operator-lifecycle-manager/pkg/package-server/server/server.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/pkg/package-server/server/server.go
Removing staging/operator-lifecycle-manager/pkg/lib/queueinformer/config_test.go
Auto-merging staging/operator-lifecycle-manager/pkg/lib/queueinformer/config.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/pkg/lib/queueinformer/config.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/olm/operatorgroup.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/olm/operator.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/pkg/controller/operators/olm/operator.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/catalogtemplate/operator.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/pkg/controller/operators/catalogtemplate/operator.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/config.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/config.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator_test.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator_test.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 bug: Switch queue informer to use types.Namespace name; relocate deletion handler (#3483)

Details

In response to this:

/cherry-pick release-4.17

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.

perdasilva · 2025-01-20T19:27:34Z

/cherry-pick release-4.18

openshift-cherrypick-robot · 2025-01-20T19:28:14Z

@perdasilva: new pull request created: #945

Details

In response to this:

/cherry-pick release-4.18

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.

openshift-bot · 2025-01-20T22:19:03Z

[ART PR BUILD NOTIFIER]

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

openshift-bot · 2025-01-20T22:19:04Z

[ART PR BUILD NOTIFIER]

Distgit: operator-lifecycle-manager
This PR has been included in build operator-lifecycle-manager-container-v4.19.0-202501202140.p0.g728cbe2.assembly.stream.el9.
All builds following this will include this PR.

openshift-bot · 2025-01-20T22:25:08Z

[ART PR BUILD NOTIFIER]

Distgit: ose-operator-framework-tools
This PR has been included in build ose-operator-framework-tools-container-v4.19.0-202501202140.p0.g728cbe2.assembly.stream.el9.
All builds following this will include this PR.

joelanford and others added 2 commits January 16, 2025 11:28

[CARRY] fixup ns labeler plugin

bb78d03

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

openshift-ci Bot requested review from dinhxuanvu and kevinrizza January 16, 2025 10:36

perdasilva mentioned this pull request Jan 16, 2025

NO-ISSUE: Synchronize From Upstream Repositories #934

Closed

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 16, 2025

openshift-ci Bot requested a review from kuiwang02 January 16, 2025 11:18

perdasilva mentioned this pull request Jan 17, 2025

NO-ISSUE: Synchronize From Upstream Repositories #937

Merged

openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 17, 2025

[CARRY] address lint issues in namespace labeler plugin

7b5944f

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

perdasilva mentioned this pull request Jan 20, 2025

[release-4.17] OCPBUGS-45845: Fix concurrent namespace resolution #944

Merged

openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 20, 2025

tmshort approved these changes Jan 20, 2025

View reviewed changes

openshift-ci Bot assigned tmshort Jan 20, 2025

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jan 20, 2025

openshift-ci Bot added the acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. label Jan 20, 2025

openshift-merge-bot Bot merged commit 728cbe2 into openshift:master Jan 20, 2025

openshift-cherrypick-robot mentioned this pull request Jan 20, 2025

[release-4.18] OCPBUGS-48636: Fix concurrent namespace resolution #945

Closed

perdasilva mentioned this pull request Jan 21, 2025

[release-4.18] OCPBUGS-48660: Fix concurrent namespace resolution #946

Merged

Conversation

perdasilva commented Jan 16, 2025

Uh oh!

perdasilva commented Jan 16, 2025

Uh oh!

openshift-ci-robot commented Jan 16, 2025

Uh oh!

perdasilva commented Jan 16, 2025

Uh oh!

perdasilva commented Jan 16, 2025

Uh oh!

perdasilva commented Jan 16, 2025

Uh oh!

perdasilva commented Jan 16, 2025

Uh oh!

perdasilva commented Jan 16, 2025

Uh oh!

kuiwang02 commented Jan 17, 2025

Uh oh!

perdasilva commented Jan 17, 2025

Uh oh!

perdasilva commented Jan 17, 2025

Uh oh!

perdasilva commented Jan 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

perdasilva commented Jan 17, 2025

Uh oh!

tmshort commented Jan 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tmshort commented Jan 17, 2025

Uh oh!

perdasilva commented Jan 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

perdasilva commented Jan 20, 2025

Uh oh!

openshift-cherrypick-robot commented Jan 20, 2025

Uh oh!

tmshort commented Jan 20, 2025

Uh oh!

tmshort left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci Bot commented Jan 20, 2025

Uh oh!

perdasilva commented Jan 20, 2025

Uh oh!

oceanc80 commented Jan 20, 2025

Uh oh!

openshift-ci Bot commented Jan 20, 2025

Uh oh!

openshift-ci-robot commented Jan 20, 2025

Uh oh!

openshift-cherrypick-robot commented Jan 20, 2025

Uh oh!

perdasilva commented Jan 20, 2025

Uh oh!

openshift-cherrypick-robot commented Jan 20, 2025

Uh oh!

openshift-bot commented Jan 20, 2025

Uh oh!

openshift-bot commented Jan 20, 2025

Uh oh!

openshift-bot commented Jan 20, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

perdasilva commented Jan 17, 2025 •

edited

Loading

tmshort commented Jan 17, 2025 •

edited

Loading

perdasilva commented Jan 20, 2025 •

edited

Loading