Skip to content

archive: improve filter error reporting#2025

Merged
openshift-merge-bot[bot] merged 1 commit intocontainers:mainfrom
giuseppe:fix-archive-filter-error-reporting
Jul 15, 2024
Merged

archive: improve filter error reporting#2025
openshift-merge-bot[bot] merged 1 commit intocontainers:mainfrom
giuseppe:fix-archive-filter-error-reporting

Conversation

@giuseppe
Copy link
Copy Markdown
Member

follow-up for #2012

report the error as seen by the input stream, instead of attempting another read.

Closes: #2022

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Jul 12, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: giuseppe

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

@rhatdan
Copy link
Copy Markdown
Member

rhatdan commented Jul 13, 2024

LGTM
@mtrmac PTAL

Copy link
Copy Markdown
Collaborator

@mtrmac mtrmac left a comment

Choose a reason for hiding this comment

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

Thanks!

LGTM otherwise.

func (r *errorRecordingReader) Read(p []byte) (int, error) {
n, err := r.r.Read(p)
if err != nil && err != io.EOF {
r.err = err
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I think this should prefer the first error, not the last one.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

yes that is better, changed now

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

… but still not store err == nil?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

… never mind, this works without an explicit check for err != nil correctly.

follow-up for containers#2012

report the error as seen by the input stream, instead of attempting
another read.

Closes: containers#2022

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
@giuseppe giuseppe force-pushed the fix-archive-filter-error-reporting branch from 46e36c2 to 91f150f Compare July 15, 2024 20:08
@rhatdan
Copy link
Copy Markdown
Member

rhatdan commented Jul 15, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Jul 15, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit a9357dd into containers:main Jul 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Improve on top of #2012

3 participants