Repository navigation
cache: continue merging the rest of entities on failure - #1616
Open
MichaelMure wants to merge 1 commit into
Open
MichaelMure wants to merge 1 commit into
MichaelMure wants to merge 1 commit into
Conversation
Contributor
There was a problem hiding this comment.
Copilot review overview
🟡 Changes recommended
Identity merging still returns early after a per-identity failure, preventing later identities from being processed.
Get a fresh assessment by requesting another Copilot review.
Review effort: Lite
Findings: 1
Open (1)
What changed in this PR
Updates cache pull handling to continue merging later entities after an earlier merge failure while preserving the first error.
Changes:
- Drain merge-result channels after failures.
- Continue processing remaining entity and cache merges.
- Add regression coverage for failures followed by later merges.
| File | Summary |
|---|---|
entity/dag/entity_actions.go |
Drains entity merge results after failure. |
entities/identity/identity_actions.go |
Identity merging can still stop after a per-identity error; changes are required. |
cache/repo_cache_test.go |
Tests merging after an identity failure. |
cache/repo_cache_common.go |
Continues merging remaining cache subentities. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Comment on lines
+34
to
+37
| if failure != nil { | ||
| // keep reading, so that the other identities are merged and | ||
| // MergeAll's goroutine doesn't block forever | ||
| continue |
This branch has not been deployed
This file contains hidden or 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
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.
No description provided.