Skip to content

Don't show context cancelled errors in attribute reader #19006

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
merged 5 commits into from
Mar 8, 2022
Merged

Don't show context cancelled errors in attribute reader #19006

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ed563a8
Don't show context cancelled errors in attribute reader
zeripath Mar 4, 2022
01d1fa6
Merge remote-tracking branch 'origin/main' into fix-18997-dont-report…
zeripath Mar 5, 2022
dd9e22a
Add some comments
zeripath Mar 5, 2022
9c80723
Merge branch 'main' into fix-18997-dont-report-ctx-closed-errors
zeripath Mar 8, 2022
ecf330c
Update modules/git/repo_attribute.go
zeripath Mar 8, 2022
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
4 changes: 3 additions & 1 deletion modules/git/repo_attribute.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,9 @@ func (c *CheckAttributeReader) Run() error {
return nil
},
})
if err != nil && c.ctx.Err() != nil && err.Error() != "signal: killed" {
if err != nil && // If there is an error we need to return but:
c.ctx.Err() != err && // 1. Ignore the context error if the context is cancelled or exceeds the deadline (RunWithContext could return c.ctx.Err() which is Canceled or DeadlineExceeded)
err.Error() != "signal: killed" { // 2. We should not pass up errors due to the program being killed
return fmt.Errorf("failed to run attr-check. Error: %w\nStderr: %s", err, stdErr.String())
}
return nil
Expand Down