Bug 2002276: Remove oudated subscription update logic to improve resolution delay

[dinhxuanvu]

Currently, olm logic checks for upgrade in subscription via another
obsolete API that is no longer in use for dependency solution. As a
result, sometimes, subscriptions display UpgradeAvailable status but
there will be no upgrades as the upgrade is not valid in the resolver.
Also, the UpgradeAvailable status is used to trigger the new resolution
even though that status is no longer a valid indicator of having a pending
upgrade. This leads to unwanted upgrade delay when the obsolete API works
properly.

This commit will remove the code that is using this obsolete API and
allow the resolution to happen when there is a subscription change.

Signed-off-by: Vu Dinh [email protected]

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dinhxuanvu

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:

• OWNERS [dinhxuanvu]

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

[openshift-ci]

@dinhxuanvu: This pull request references Bugzilla bug 2002276, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug

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

Requesting review from QA contact:
/cc @jianzhangbjz

In response to this:

Bug 2002276: Remove oudated subscription update logic to improve resolution delay

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.

[jianzhangbjz]

/label qe-approved

[jianzhangbjz]

/lgtm

[openshift-ci]

@dinhxuanvu: All pull requests linked via external trackers have merged:

• openshift/operator-framework-olm#211

Bugzilla bug 2002276 has been moved to the MODIFIED state.

In response to this:

Bug 2002276: Remove oudated subscription update logic to improve resolution delay

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.

[jianzhangbjz]

@dinhxuanvu One question, maybe I missed something, why not us use the defer here?

[timflannagan]

You wouldn't be able to use defer here as we're performing locking/unlocking operations during a for loop and the defer statement only triggers once the function finishes execution. In order to use a defer statement here, you would need to wrap the lock/unlock logic into an anonymous function:

for key, snapshot := range c.snapshots {
    func() {
        snapshot.m.RLock()
        defer snapshot.m.RUnlock()
        ...
    }
}

[jianzhangbjz]

@timflannagan Thanks for your clarification! I think we should make sure the RLock can be released successfully. Actually, we met an issue: https://bugzilla.redhat.com/show_bug.cgi?id=2020486 that the status of the CatalogSource is lastObservedState: IDLE sometimes, and I checked the logs, found the warning: level=warning msg="couldn't find service in cache". I guess it's related to this PR.

[yuvalk]

can we backport this to 4.9?

[sferich888]

/cherry-pick release-4.7

[openshift-cherrypick-robot]

@sferich888: #211 failed to apply on top of branch "release-4.7":

Applying: Remove oudated subscription update logic to improve resolution delay (#2369)
Using index info to reconstruct a base tree...
M	staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go
A	staging/operator-lifecycle-manager/pkg/controller/operators/catalog/querier.go
A	staging/operator-lifecycle-manager/pkg/controller/operators/catalog/querier_test.go
M	staging/operator-lifecycle-manager/test/e2e/subscription_e2e_test.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go
A	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/querier.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/querier.go deleted in HEAD and modified in Remove oudated subscription update logic to improve resolution delay (#2369). Version Remove oudated subscription update logic to improve resolution delay (#2369) of vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/querier.go left in tree.
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go
Auto-merging staging/operator-lifecycle-manager/test/e2e/subscription_e2e_test.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/registry/resolver/querier_test.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/pkg/controller/registry/resolver/querier_test.go
CONFLICT (modify/delete): staging/operator-lifecycle-manager/pkg/controller/operators/catalog/querier.go deleted in HEAD and modified in Remove oudated subscription update logic to improve resolution delay (#2369). Version Remove oudated subscription update logic to improve resolution delay (#2369) of staging/operator-lifecycle-manager/pkg/controller/operators/catalog/querier.go left in tree.
Auto-merging 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
Patch failed at 0001 Remove oudated subscription update logic to improve resolution delay (#2369)
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".

In response to this:

/cherry-pick release-4.7

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.