Skip to content

Conversation

@rescrv
Copy link
Contributor

@rescrv rescrv commented Jun 20, 2025

Description of changes

If there is a transient error on scrub, the error will present as a bad
checksum, but the actual error gets dropped.

Test plan

CI

Documentation Changes

N/A

@github-actions
Copy link

Reviewer Checklist

Please leverage this checklist to ensure your code review is thorough before approving

Testing, Bugs, Errors, Logs, Documentation

  • Can you think of any use case in which the code does not behave as intended? Have they been tested?
  • Can you think of any inputs or external events that could break the code? Is user input validated and safe? Have they been tested?
  • If appropriate, are there adequate property based tests?
  • If appropriate, are there adequate unit tests?
  • Should any logging, debugging, tracing information be added or removed?
  • Are error messages user-friendly?
  • Have all documentation changes needed been made?
  • Have all non-obvious changes been commented?

System Compatibility

  • Are there any potential impacts on other parts of the system or backward compatibility?
  • Does this change intersect with any items on our roadmap, and if so, is there a plan for fitting them together?

Quality

  • Is this code of a unexpectedly high quality (Readability, Modularity, Intuitiveness)

@propel-code-bot
Copy link
Contributor

This PR fixes scrub error handling in the log scrubbing logic so that when a manifest/observed scrub mismatch occurs, it returns both the checksum mismatch error and any other collected errors instead of dropping the additional error context. This ensures transient and data errors are surfaced to callers for improved diagnosability.

This summary was automatically generated by @propel-code-bot

Comment on lines +446 to +447
ret.extend(errors);
Err(ret)
Copy link
Contributor

Choose a reason for hiding this comment

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

q: why not errors.push(...) and Err(errors)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I want the overall error first. Would you prefer errors.insert(0, ...)?

@rescrv rescrv merged commit 5cc8480 into main Jun 20, 2025
113 of 115 checks passed
@rescrv rescrv deleted the rescrv/error-scrub branch June 20, 2025 18:13
Inventrohyder pushed a commit to Inventrohyder/chroma that referenced this pull request Aug 5, 2025
…ore#4898)

## Description of changes

If there is a transient error on scrub, the error will present as a bad
checksum, but the actual error gets dropped.

## Test plan

CI

## Documentation Changes

N/A
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.

3 participants