Skip to content

pkg/daemon: fix pending config logic#719

Merged
imcleod merged 1 commit intoopenshift:masterfrom
runcom:fix-logic-pending-config
May 8, 2019
Merged

pkg/daemon: fix pending config logic#719
imcleod merged 1 commit intoopenshift:masterfrom
runcom:fix-logic-pending-config

Conversation

@runcom
Copy link
Copy Markdown
Member

@runcom runcom commented May 8, 2019

we don't need to compare bootid if we have a not pending config...

xref #711

@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label May 8, 2019
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 8, 2019
@runcom runcom force-pushed the fix-logic-pending-config branch from f2b1035 to fde19b3 Compare May 8, 2019 13:37
@cgwalters
Copy link
Copy Markdown
Member

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label May 8, 2019
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

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:

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

Comment thread pkg/daemon/update.go
return "", nil
}
if entry.BootID == dn.bootID {
return "", fmt.Errorf("pending config %s bootID %s matches current! Failed to reboot?", entry.Message, dn.bootID)
Copy link
Copy Markdown
Member Author

@runcom runcom May 8, 2019

Choose a reason for hiding this comment

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

@cgwalters this is a dangerous check that we've been doing over time.... if the MCD is killed before resetting the pending state (irrespective of journal vs ondisk, this is just a bug I guess now), this check is gonna fire and crashloop. Maybe we just need to log this?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Yeah, this code predated the MCD being a controller.

Dunno. I'm OK changing this to a warning. We could also just leave it as is as the problem goes away with the journal approach.

@runcom
Copy link
Copy Markdown
Member Author

runcom commented May 8, 2019

/refresh

@runcom runcom added lgtm Indicates that a PR is ready to be merged. and removed lgtm Indicates that a PR is ready to be merged. labels May 8, 2019
@imcleod
Copy link
Copy Markdown
Contributor

imcleod commented May 8, 2019

LGTM - Merging immediately per request from Antonio

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

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants