Skip to content

daemon: Drop workarounds for rpm-ostree bugs #3239

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

Merged
openshift-ci merged 1 commit into from
Jul 20, 2022
Merged

daemon: Drop workarounds for rpm-ostree bugs #3239

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 1 addition & 32 deletions pkg/daemon/rpm-ostree.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,38 +100,7 @@ func (r *RpmOstreeClient) loadStatus() (*rpmOstreeState, error) {
}

func (r *RpmOstreeClient) Initialize() error {
Copy link
Contributor

@yuqi-zhang yuqi-zhang Jul 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, maybe it's worth removing Initialize() altogether then, since the non-rpmostree client doesn't use this either.

// This replicates https://github.com/coreos/rpm-ostree/pull/2945
// and can be removed when we have a new enough rpm-ostree with
// that PR.
err := runCmdSync("systemctl", "start", "rpm-ostreed")
if err != nil {
// If this fails for some reason, let's dump the unit status
// into our logs to aid future debugging.
cmd := exec.Command("systemctl", "status", "rpm-ostreed")
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
_ = cmd.Run()
return err
}

status, err := r.loadStatus()
if err != nil {
return err
}

// If there's an active transaction when the MCD starts up,
// it's possible that we hit
// https://bugzilla.redhat.com/show_bug.cgi?id=1982389
// This is fixed upstream, but we need a newer RHEL for that,
// so let's just restart the service as a workaround.
if status.Transaction != nil {
glog.Warningf("Detected active transaction during daemon startup, restarting to clear it")
err := runCmdSync("systemctl", "restart", "rpm-ostreed")
if err != nil {
return err
}
}

// This used to have some workarounds for rpm-ostree bugs, but we no longer need those.
return nil
}

Expand Down