Bug 2057544: daemon: Explicitly start rpm-ostreed, restart if we detect active txn by cgwalters · Pull Request #2967 · openshift/machine-config-operator

cgwalters · 2022-02-25T15:45:42Z

Cherry-picked from #2677

This is a workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1982389
which is already fixed in rpm-ostree in
coreos/rpm-ostree#2995
because it will take a fair while until we can ship the fixed
rpm-ostreed in RHEL and then OpenShift stable versions.
(Yes, this is a sad recurring pattern)

The updater client gains an explicit Initialize method, where
we also explicitly systemctl start rpm-ostreed which
then effectively rolls in the change from
coreos/rpm-ostree#2945
too.

This is a workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1982389 which is already fixed in rpm-ostree in coreos/rpm-ostree#2995 because it will take a fair while until we can ship the fixed rpm-ostreed in RHEL and then OpenShift stable versions. (Yes, this is a sad recurring pattern) The updater client gains an explicit `Initialize` method, where we also explicitly `systemctl start rpm-ostreed` which then effectively rolls in the change from coreos/rpm-ostree#2945 too.

openshift-ci · 2022-02-25T15:45:45Z

@cgwalters: 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:

BZ 2057544: daemon: Explicitly start rpm-ostreed, restart if we detect active txn

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.

cgwalters · 2022-02-25T15:46:37Z

/bugzilla refresh

openshift-ci · 2022-02-25T15:46:41Z

@cgwalters: This pull request references Bugzilla bug 2057544, which is invalid:

expected the bug to target the "4.8.z" release, but it targets "---" instead
expected Bugzilla bug 2057544 to depend on a bug targeting a release in 4.9.0, 4.9.z and in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but no dependents were found

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

/bugzilla 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 kubernetes/test-infra repository.

openshift-ci · 2022-02-25T15:47:06Z

@cgwalters: This pull request references Bugzilla bug 2057544, which is invalid:

expected the bug to target the "4.8.z" release, but it targets "---" instead
expected Bugzilla bug 2057544 to depend on a bug targeting a release in 4.9.0, 4.9.z and in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but no dependents were found

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

Bug 2057544: daemon: Explicitly start rpm-ostreed, restart if we detect active txn

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.

cgwalters · 2022-02-25T15:50:44Z

OK so this fix was merged in 4.9 development...do I need to file a BZ against 4.9 and then close it?

kikisdeliveryservice · 2022-02-25T18:06:58Z

OK so this fix was merged in 4.9 development...do I need to file a BZ against 4.9 and then close it?

yeah I think so. we can just dupe the bz and mark it as Closed: Current Release

kikisdeliveryservice · 2022-02-25T18:07:58Z

/backport-risk-assessed
/approve

openshift-ci · 2022-02-25T18:08:38Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cgwalters, kikisdeliveryservice

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

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

kikisdeliveryservice · 2022-02-25T18:11:50Z

/bugzilla refresh

openshift-ci · 2022-02-25T18:11:58Z

@kikisdeliveryservice: This pull request references Bugzilla bug 2057544, 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 release (4.8.z) matches configured target release for branch (4.8.z)
bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
dependent bug Bugzilla bug 2058738 is in the state CLOSED (CURRENTRELEASE), which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
dependent Bugzilla bug 2058738 targets the "4.9.0" release, which is one of the valid target releases: 4.9.0, 4.9.z
bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Bugzilla (rioliu@redhat.com), skipping review request.

Details

In response to this:

/bugzilla 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 kubernetes/test-infra repository.

cgwalters · 2022-02-25T18:24:06Z

The original PR didn't add an e2e to test the failure condition, but I am pretty sure I did so manually. But, our CI will test the "happy path" of upgrades as usual, so worst case is this fails to fix the bug, but I think has no risk beyond that.

openshift-bot · 2022-02-25T18:59:21Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2022-02-25T19:23:20Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2022-02-25T19:59:21Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2022-02-25T22:35:20Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2022-02-25T22:48:16Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2022-02-25T23:27:08Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2022-02-28T14:47:12Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2022-02-28T16:30:16Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2022-02-28T16:43:13Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2022-02-28T17:22:12Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2022-02-28T17:48:23Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2022-02-28T18:01:13Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2022-02-28T18:40:05Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2022-02-28T19:05:55Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2022-02-28T19:18:51Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2022-02-28T21:28:53Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2022-02-28T22:20:54Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2022-02-28T22:33:53Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

kikisdeliveryservice · 2022-02-28T22:38:16Z

/skip

sdodson · 2022-04-26T18:46:01Z

@rioliu-rh Can QE please consider adding cherry-pick-approved here.

rioliu-rh · 2022-04-26T23:54:34Z

/label cherry-pick-approved

openshift-bot · 2022-04-27T01:59:51Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2022-04-27T04:31:49Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2022-04-27T08:38:50Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2022-04-27T09:30:31Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2022-04-27T09:42:28Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-ci · 2022-04-27T12:01:57Z

@cgwalters: 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-e2e-upgrade	`83aaf22`	link	false	`/test okd-e2e-upgrade`
ci/prow/e2e-metal-ipi	`83aaf22`	link	false	`/test e2e-metal-ipi`
ci/prow/okd-e2e-aws	`83aaf22`	link	false	`/test okd-e2e-aws`

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.

openshift-bot · 2022-04-27T12:56:31Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

sdodson · 2022-04-27T15:08:06Z

/override ci/prow/e2e-metal-ipi-ovn-ipv6
This has a 0% pass rate over the past two months in other PRs and periodics.

openshift-ci · 2022-04-27T15:08:09Z

@sdodson: Overrode contexts on behalf of sdodson: ci/prow/e2e-metal-ipi-ovn-ipv6

Details

In response to this:

/override ci/prow/e2e-metal-ipi-ovn-ipv6
This has a 0% pass rate over the past two months in other PRs and periodics.

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 · 2022-04-27T15:10:49Z

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

openshift/machine-config-operator#2967

Bugzilla bug 2057544 has been moved to the MODIFIED state.

Details

In response to this:

Bug 2057544: daemon: Explicitly start rpm-ostreed, restart if we detect active txn

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.

cgwalters · 2022-07-07T18:51:32Z

/cherrypick release-4.7

openshift-cherrypick-robot · 2022-07-07T18:52:11Z

@cgwalters: #2967 failed to apply on top of branch "release-4.7":

Applying: daemon: Explicitly start rpm-ostreed, restart if we detect active txn
Using index info to reconstruct a base tree...
M	pkg/daemon/daemon.go
M	pkg/daemon/rpm-ostree.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/daemon/rpm-ostree.go
CONFLICT (content): Merge conflict in pkg/daemon/rpm-ostree.go
Auto-merging pkg/daemon/daemon.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 daemon: Explicitly start rpm-ostreed, restart if we detect active txn
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".

Details

In response to this:

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

cgwalters changed the title ~~BZ 2057544: daemon: Explicitly start rpm-ostreed, restart if we detect active txn~~ Bug 2057544: daemon: Explicitly start rpm-ostreed, restart if we detect active txn Feb 25, 2022

openshift-ci Bot added bugzilla/severity-unspecified Referenced Bugzilla bug's severity is unspecified for the PR. bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Feb 25, 2022

openshift-ci Bot added bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. and removed bugzilla/severity-unspecified Referenced Bugzilla bug's severity is unspecified for the PR. labels Feb 25, 2022

openshift-ci Bot requested review from sinnykumari and yuqi-zhang February 25, 2022 15:47

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 25, 2022

openshift-ci Bot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Feb 25, 2022

openshift-ci Bot removed the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Feb 25, 2022

kikisdeliveryservice added lgtm Indicates that a PR is ready to be merged. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. labels Feb 25, 2022

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 Apr 26, 2022

openshift-merge-robot merged commit 58e7362 into openshift:release-4.8 Apr 27, 2022

cgwalters mentioned this pull request Jul 7, 2022

Bug 2105082: 4.7: daemon: Explicitly start rpm-ostreed, restart if we detect active txn #3240

Merged

Conversation

cgwalters commented Feb 25, 2022

Uh oh!

openshift-ci Bot commented Feb 25, 2022

Uh oh!

cgwalters commented Feb 25, 2022

Uh oh!

openshift-ci Bot commented Feb 25, 2022

Uh oh!

openshift-ci Bot commented Feb 25, 2022

Uh oh!

cgwalters commented Feb 25, 2022

Uh oh!

kikisdeliveryservice commented Feb 25, 2022

Uh oh!

kikisdeliveryservice commented Feb 25, 2022

Uh oh!

openshift-ci Bot commented Feb 25, 2022

Uh oh!

kikisdeliveryservice commented Feb 25, 2022

Uh oh!

openshift-ci Bot commented Feb 25, 2022

Uh oh!

cgwalters commented Feb 25, 2022

Uh oh!

openshift-bot commented Feb 25, 2022

Uh oh!

openshift-bot commented Feb 25, 2022

Uh oh!

openshift-bot commented Feb 25, 2022

Uh oh!

openshift-bot commented Feb 25, 2022

Uh oh!

openshift-bot commented Feb 25, 2022

Uh oh!

openshift-bot commented Feb 25, 2022

Uh oh!

openshift-bot commented Feb 28, 2022

Uh oh!

openshift-bot commented Feb 28, 2022

Uh oh!

openshift-bot commented Feb 28, 2022

Uh oh!

openshift-bot commented Feb 28, 2022

Uh oh!

openshift-bot commented Feb 28, 2022

Uh oh!

openshift-bot commented Feb 28, 2022

Uh oh!

openshift-bot commented Feb 28, 2022

Uh oh!

openshift-bot commented Feb 28, 2022

Uh oh!

openshift-bot commented Feb 28, 2022

Uh oh!

openshift-bot commented Feb 28, 2022

Uh oh!

openshift-bot commented Feb 28, 2022

Uh oh!

openshift-bot commented Feb 28, 2022

Uh oh!

kikisdeliveryservice commented Feb 28, 2022

Uh oh!

sdodson commented Apr 26, 2022

Uh oh!

rioliu-rh commented Apr 26, 2022

Uh oh!

openshift-bot commented Apr 27, 2022

Uh oh!

openshift-bot commented Apr 27, 2022

Uh oh!

openshift-bot commented Apr 27, 2022

Uh oh!

openshift-bot commented Apr 27, 2022

Uh oh!

openshift-bot commented Apr 27, 2022

Uh oh!

openshift-ci Bot commented Apr 27, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci Bot commented Apr 27, 2022 •

edited

Loading