Skip to content
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.

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

Fix unknown issue with eve agent init #3567

Merged
merged 2 commits into from
Nov 7, 2023

Conversation

christoph-zededa
Copy link
Contributor

@christoph-zededa christoph-zededa commented Nov 7, 2023

Internal tests showed a problem with a machine not coming up again if these commits are included; for now reverting them.

@christoph-zededa christoph-zededa marked this pull request as draft November 7, 2023 09:06
@christoph-zededa christoph-zededa marked this pull request as ready for review November 7, 2023 09:15
This reverts commit 8b66837.

Signed-off-by: Christoph Ostarek <[email protected]>
This reverts commit 8b1f5ba.

Signed-off-by: Christoph Ostarek <[email protected]>
Copy link

codecov bot commented Nov 7, 2023

Codecov Report

Attention: 41 lines in your changes are missing coverage. Please review.

Comparison is base (ad2f0b2) 19.47% compared to head (c7c98de) 19.46%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #3567      +/-   ##
==========================================
- Coverage   19.47%   19.46%   -0.01%     
==========================================
  Files         231      231              
  Lines       50220    50211       -9     
==========================================
- Hits         9778     9776       -2     
+ Misses      39723    39719       -4     
+ Partials      719      716       -3     
Files Coverage Δ
pkg/pillar/hypervisor/hypervisor.go 24.07% <ø> (-5.10%) ⬇️
pkg/pillar/cmd/usbmanager/usbmanager.go 0.00% <0.00%> (ø)
pkg/pillar/cmd/domainmgr/domainmgr.go 0.40% <0.00%> (-0.01%) ⬇️

... and 2 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@@ -81,7 +82,7 @@ func Run(ps *pubsub.PubSub, loggerArg *logrus.Logger, logArg *base.LogObject, ar
}
log.Functionf("processed Vault Status")

currentHypervisor := hypervisor.CurrentHypervisor()
currentHypervisor := domainmgr.CurrentHypervisor()
Copy link
Contributor

Choose a reason for hiding this comment

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

It probably makes sense to have this pick up and use the boot time hypervisor by parsing /run/eve-hv-type.

Copy link
Contributor

Choose a reason for hiding this comment

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

But let's do that in a separate PR.

Copy link
Contributor

@eriknordmark eriknordmark left a comment

Choose a reason for hiding this comment

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

Looks like this fixes the problem but it would be good to update the title and description (you fixed EVE not ztests). The issue was failing to update EVE-OS from the latest master to something else, but did you figure out why that init function caused things to break?

@christoph-zededa christoph-zededa changed the title WIP: Fix ztests Fix unknown issue with eve agent init Nov 7, 2023
Copy link
Contributor

@eriknordmark eriknordmark left a comment

Choose a reason for hiding this comment

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

Thanks for tracking this down.

@eriknordmark eriknordmark merged commit bbf677b into lf-edge:master Nov 7, 2023
29 of 39 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants