[release-4.16] OCPBUGS-43964: Fix desired before sync_worker's work is initialized by hongkailiu · Pull Request #1097 · openshift/cluster-version-operator

hongkailiu · 2024-10-29T19:13:57Z

This PR cherry-picks the commit from #1075 as it introduced sortedKnownCaps which is used by the other commits that are backported from #1089.

openshift-ci-robot · 2024-10-29T19:14:02Z

@hongkailiu: This pull request explicitly references no jira issue.

Details

In response to this:

This PR cherry-picks the commit from #1075 as it introduced sortedKnownCaps which is used by a backport to 4.16.

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.

If the CVO pod gets restarted after a user sends a cluster upgrade request with `--to-image`, the desired should not ALWAYS be taken from `.Spec.DesiredUpdate`, e.g., when the targeting payload is blocked on some precondition check failure. The user request will be written to `cv.spec.desiredUpdate` where only the `image` field is set, i.e., the `Version` field is empty. If the CVO gets restarted, then 1. The desied [1] from `cv.spec.desiredUpdate` will be used to set `w.status.Actual` [2] and then applied to `cv.status.desired`. 2. When the next `optr.sync()` happens, the precondition check may become non-blocking [3] as the `Version` field is empty now. 3. CVO will then start an upgrade that should have been blocked. [1]. https://github.com/openshift/cluster-version-operator/blob/1995380b6d755c29b926b846a64ca0039002c2cf/pkg/cvo/cvo.go#L680 [2]. https://github.com/openshift/cluster-version-operator/blob/1995380b6d755c29b926b846a64ca0039002c2cf/pkg/cvo/sync_worker.go#L502 [3]. https://github.com/openshift/cluster-version-operator/blob/1995380b6d755c29b926b846a64ca0039002c2cf/pkg/payload/precondition/clusterversion/rollback.go#L57

openshift-ci-robot · 2024-10-29T19:48:16Z

@hongkailiu: This pull request references Jira Issue OCPBUGS-43964, which is invalid:

expected dependent Jira Issue OCPBUGS-42386 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is POST 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 PR cherry-picks the commit from #1075 as it introduced sortedKnownCaps which is used by the other commits that are backported too.

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.

hongkailiu · 2024-10-29T19:50:55Z

/label tide/merge-method-squash

hongkailiu · 2024-10-29T19:53:01Z

/retitle [release-4.16] OCPBUGS-43964: Fix desired before sync_worker's work is initialized

hongkailiu · 2024-10-29T19:54:09Z

/jira refresh

openshift-ci-robot · 2024-10-29T19:54:14Z

@hongkailiu: This pull request references Jira Issue OCPBUGS-43964, which is invalid:

expected dependent Jira Issue OCPBUGS-42386 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is POST 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:

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

hongkailiu · 2024-10-29T22:17:07Z

/test e2e-agnostic-operator

openshift-ci · 2024-10-30T00:03:59Z

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

hongkailiu · 2024-10-30T18:38:05Z

/jira refresh

openshift-ci-robot · 2024-10-30T18:38:10Z

@hongkailiu: This pull request references Jira Issue OCPBUGS-43964, which is invalid:

expected dependent Jira Issue OCPBUGS-42386 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is ON_QA 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.

hongkailiu · 2024-11-01T14:04:57Z

/remove-label tide/merge-method-squash

wking · 2024-11-04T00:05:36Z

/jira refresh

openshift-ci-robot · 2024-11-04T00:05:42Z

@wking: This pull request references Jira Issue OCPBUGS-43964, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.16.z) matches configured target version for branch (4.16.z)
bug is in the state New, 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-42386 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-42386 targets the "4.17.z" version, which is one of the valid target versions: 4.17.0, 4.17.z
bug has dependents

Requesting review from QA contact:
/cc @evakhoni

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.

wking

/lgtm
/label backport-risk-assessed

openshift-ci · 2024-11-04T00:06:36Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hongkailiu, wking

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~~ [wking]

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

evakhoni · 2024-11-04T16:06:04Z

verified.
/label qe-approved
/cc @jiajliu
tnx

openshift-ci-robot · 2024-11-04T16:06:25Z

@hongkailiu: This pull request references Jira Issue OCPBUGS-43964, which is valid.

7 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.16.z) matches configured target version for branch (4.16.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-42386 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-42386 targets the "4.17.z" version, which is one of the valid target versions: 4.17.0, 4.17.z
bug has dependents

Requesting review from QA contact:
/cc @evakhoni

Details

In response to this:

This PR cherry-picks the commit from #1075 as it introduced sortedKnownCaps which is used by the other commits that are backported from #1089.

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.

jiajliu · 2024-11-05T00:15:05Z

/label cherry-pick-approved

openshift-ci-robot · 2024-11-05T00:18:50Z

@hongkailiu: Jira Issue OCPBUGS-43964: All pull requests linked via external trackers have merged:

openshift/cluster-version-operator#1097

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

Details

In response to this:

This PR cherry-picks the commit from #1075 as it introduced sortedKnownCaps which is used by the other commits that are backported from #1089.

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 · 2024-11-05T01:18:27Z

[ART PR BUILD NOTIFIER]

Distgit: cluster-version-operator
This PR has been included in build cluster-version-operator-container-v4.16.0-202411050035.p0.g15c87e7.assembly.stream.el9.
All builds following this will include this PR.

wking · 2024-11-05T22:43:17Z

/cherrypick release-4.15

openshift-cherrypick-robot · 2024-11-05T22:43:57Z

@wking: #1097 failed to apply on top of branch "release-4.15":

Applying: TestCVO: set known caps from configv1.KnownClusterVersionCapabilities
Using index info to reconstruct a base tree...
M	pkg/cvo/cvo_scenarios_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/cvo/cvo_scenarios_test.go
CONFLICT (content): Merge conflict in pkg/cvo/cvo_scenarios_test.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 TestCVO: set known caps from configv1.KnownClusterVersionCapabilities

Details

In response to this:

/cherrypick release-4.15

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-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Oct 29, 2024

openshift-ci bot requested review from petr-muller and wking October 29, 2024 19:14

hongkailiu force-pushed the sortedKnownCaps-release-4.16 branch from aecaacc to 8e4755b Compare October 29, 2024 19:25

ingvagabund and others added 6 commits October 29, 2024 15:27

TestCVO: set known caps from configv1.KnownClusterVersionCapabilities

e94580f

Fix unit tests

6906bbf

Add test to cover the case of stillInitializing == true

e3a05d4

Better naming of variables and functions

a1ee1ca

Improve some wording and simplify unit tests

ae4e180

hongkailiu force-pushed the sortedKnownCaps-release-4.16 branch from 8e4755b to ae4e180 Compare October 29, 2024 19:27

hongkailiu changed the title ~~NO-JIRA: TestCVO: set known caps from configv1.KnownClusterVersionCapabilities~~ OCPBUGS-43964: TestCVO: set known caps from configv1.KnownClusterVersionCapabilities Oct 29, 2024

openshift-ci-robot added the jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. label Oct 29, 2024

openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Oct 29, 2024

hongkailiu mentioned this pull request Oct 29, 2024

[release-4.16] OCPBUGS-43964: Fix desired before sync_worker's work is initialized #1096

Closed

openshift-ci bot added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Oct 29, 2024

openshift-ci bot changed the title ~~OCPBUGS-43964: TestCVO: set known caps from configv1.KnownClusterVersionCapabilities~~ [release-4.16] OCPBUGS-43964: Fix desired before sync_worker's work is initialized Oct 29, 2024

openshift-ci bot removed the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Nov 1, 2024

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 Nov 4, 2024

openshift-ci bot requested a review from evakhoni November 4, 2024 00:05

wking approved these changes Nov 4, 2024

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 Nov 4, 2024

openshift-ci bot assigned wking Nov 4, 2024

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 4, 2024

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 4, 2024

openshift-ci bot requested a review from jiajliu November 4, 2024 16:06

openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Nov 4, 2024

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 Nov 5, 2024

openshift-merge-bot bot merged commit 15c87e7 into openshift:release-4.16 Nov 5, 2024

Comments

Conversation

hongkailiu commented Oct 29, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Oct 29, 2024

Uh oh!

openshift-ci-robot commented Oct 29, 2024

Uh oh!

hongkailiu commented Oct 29, 2024

Uh oh!

hongkailiu commented Oct 29, 2024

Uh oh!

hongkailiu commented Oct 29, 2024

Uh oh!

openshift-ci-robot commented Oct 29, 2024

Uh oh!

hongkailiu commented Oct 29, 2024

Uh oh!

openshift-ci bot commented Oct 30, 2024

Uh oh!

hongkailiu commented Oct 30, 2024

Uh oh!

openshift-ci-robot commented Oct 30, 2024

Uh oh!

hongkailiu commented Nov 1, 2024

Uh oh!

wking commented Nov 4, 2024

Uh oh!

openshift-ci-robot commented Nov 4, 2024

Uh oh!

wking left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci bot commented Nov 4, 2024

Uh oh!

evakhoni commented Nov 4, 2024

Uh oh!

openshift-ci-robot commented Nov 4, 2024

Uh oh!

jiajliu commented Nov 5, 2024

Uh oh!

openshift-ci-robot commented Nov 5, 2024

Uh oh!

openshift-bot commented Nov 5, 2024

Uh oh!

wking commented Nov 5, 2024

Uh oh!

openshift-cherrypick-robot commented Nov 5, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

hongkailiu commented Oct 29, 2024 •

edited

Loading