Skip to content

[release-4.13] OCPBUGS-9951: daemon: Always remove pending deployment before we do updates #3601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
openshift-cherrypick-robot wants to merge 2 commits into from
Closed

[release-4.13] OCPBUGS-9951: daemon: Always remove pending deployment before we do updates #3601

openshift-cherrypick-robot wants to merge 2 commits into from

Conversation

@openshift-cherrypick-robot
Copy link

@openshift-cherrypick-robot openshift-cherrypick-robot commented Mar 9, 2023

This is an automated cherry-pick of #3599

/assign cgwalters

cgwalters added 2 commits March 9, 2023 23:34
@cgwalters
daemon: Move cleanup of pending deployment earlier
c02981f 
We hit a confusing failure in https://issues.redhat.com/browse/OCPBUGS-8113
where the MCD will get stuck if deploying the RT kernel fails, because
the switch to the RT kernel operates from the *booted* deployment
state, but by default rpm-ostree wants to operate from pending.

Move up the "cleanup pending deployment on failure" `defer` to
right before we do anything else.
@cgwalters
daemon: Always remove pending deployment before we do updates
a101c02 
The RT kernel switch logic operates from the *booted* deployment,
not pending.  I had in my head that the MCO always cleaned up
pending, but due to another bug we didn't.

There's no reason to leave this cleanup to a defer; do it
before we do anything else.

(But keep the defer because it's cleaner to *also* cleanup if
 we fail)
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Mar 9, 2023
Merged
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Mar 9, 2023

@openshift-cherrypick-robot: Jira Issue OCPBUGS-9685 has been cloned as Jira Issue OCPBUGS-9951. Will retitle bug to link to clone.
/retitle [release-4.13] OCPBUGS-9951: daemon: Always remove pending deployment before we do updates

Details

In response to this:

This is an automated cherry-pick of #3599

/assign cgwalters

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 openshift-ci bot changed the title [release-4.13] OCPBUGS-9685: daemon: Always remove pending deployment before we do updates [release-4.13] OCPBUGS-9951: daemon: Always remove pending deployment before we do updates Mar 9, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 9, 2023

@openshift-cherrypick-robot: 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:

[release-4.13] OCPBUGS-9951: daemon: Always remove pending deployment before we do updates

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 openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Mar 9, 2023
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Mar 9, 2023

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-9951, 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.13.0) matches configured target version for branch (4.13.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-9685 is in the state MODIFIED, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-9685 targets the "4.14.0" version, which is one of the valid target versions: 4.14.0
  • bug has dependents

Requesting review from QA contact:
/cc @rioliu-rh

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

Details

In response to this:

This is an automated cherry-pick of #3599

/assign cgwalters

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

openshift-ci bot commented Mar 9, 2023

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: openshift-cherrypick-robot
Once this PR has been reviewed and has the lgtm label, please assign cgwalters for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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

@cgwalters
Copy link
Member

cgwalters commented Mar 10, 2023

/test e2e-gcp-op

@cgwalters cgwalters mentioned this pull request Mar 10, 2023
Merged
@cgwalters
Copy link
Member

cgwalters commented Mar 10, 2023

Actually closing in favor of #3604

@cgwalters cgwalters closed this Mar 10, 2023
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Mar 10, 2023

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-9951. The bug has been updated to no longer refer to the pull request using the external bug tracker.

Details

In response to this:

This is an automated cherry-pick of #3599

/assign cgwalters

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

openshift-ci bot commented Mar 10, 2023

@openshift-cherrypick-robot: 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/okd-scos-e2e-vsphere-ovn a101c02 link false /test okd-scos-e2e-vsphere-ovn
ci/prow/okd-scos-e2e-gcp-ovn-upgrade a101c02 link false /test okd-scos-e2e-gcp-ovn-upgrade
ci/prow/e2e-gcp-rt-op a101c02 link false /test e2e-gcp-rt-op

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rioliu-rh rioliu-rh Awaiting requested review from rioliu-rh

@jkyros jkyros Awaiting requested review from jkyros

@sinnykumari sinnykumari Awaiting requested review from sinnykumari

Assignees

@cgwalters cgwalters

Labels

bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid 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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@openshift-cherrypick-robot @openshift-ci-robot @cgwalters