Fix error reporting #8250
Merged
Fix error reporting #8250
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportPatch coverage has no change and project coverage change:
Additional details and impacted files@@ Coverage Diff @@
## master #8250 +/- ##
==========================================
+ Coverage 47.45% 51.58% +4.12%
==========================================
Files 143 143
Lines 14724 14732 +8
==========================================
+ Hits 6988 7599 +611
+ Misses 6631 5931 -700
- Partials 1105 1202 +97
Flags with carried forward coverage won't be shown. Click here to find out more.
☔ View full report in Codecov by Sentry. |
brandond
reviewed
Aug 28, 2023
pkg/agent/containerd/containerd.go
Outdated
| @@ -93,7 +93,7 @@ func Run(ctx context.Context, cfg *config.Node) error { | |||
|
|
|||
| addDeathSig(cmd) | |||
| if err := cmd.Run(); err != nil { | |||
| fmt.Fprintf(os.Stderr, "containerd: %s\n", err) | |||
| logrus.Errorf("containerd failed: %s", err) | |||
There was a problem hiding this comment.
nit: in other places we say "exited" when things exit unexpectedly
Suggested change
| logrus.Errorf("containerd failed: %s", err) | |
| logrus.Errorf("containerd exited: %s", err) |
brandond
approved these changes
Aug 28, 2023
Signed-off-by: Manuel Buil <mbuil@suse.com>
manuelbuil
force-pushed
the
fixWinError
branch
from
2da7271
to
d3f7632
Compare
osodracnai
approved these changes
Aug 31, 2023
|
Code freeze period. No merging! |
brandond
approved these changes
Aug 31, 2023
This was referenced Sep 22, 2023
This was referenced Nov 1, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed Changes
Use logrus to report the error instead of fmt to avoid an rke2 windows bug.
This fixes: rancher/rke2#4693
To report stuff on Windows Event Logger, we are using a logrus hook, i.e. any log created by logrus, gets printed in the Event Tracing for Windows (EWT) (some sort of journalctl). However, anything else is dropped, e.g. fmt messages.
https://github.com/rancher/wins/blob/main/pkg/logs/etw.go#L125-L132
Types of Changes
Bugfix
Verification
Try breaking something in containerd/k3s and check that it gets reported correctly in journalctl
Testing
The bug is in rke2
Linked Issues
rancher/rke2#4693
#8251
User-Facing Change
Further Comments