IVY-1204, IVY-1585: if dependency is rejected, reject parent revision and restart#125
Open
eric-milles wants to merge 1 commit into
Open
IVY-1204, IVY-1585: if dependency is rejected, reject parent revision and restart#125eric-milles wants to merge 1 commit into
eric-milles wants to merge 1 commit into
Conversation
Member
Author
|
@maartenc okay? |
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.
This should also close IVY-1228 in my estimation. After blacklisting
B;2.2andA;1.1, the dynamic revisionB;[0.0,)resolves toB;2.1next. That node has dependencyA;1.1. The usual logic is to find or make anIvyNodefor this mrid.ResolveDataretains such anIvyNodeto hold eviction data. This eviction data is not checked andA;1.1was already downloaded previously, so normal conflict resolve does not catch this.I tried a few different things, but the most straightforward thing to do seemed to be check for blacklisting of dependency revision. If so listed, propagate the blacklisting to the requesting node --
B;2.1in this case.If instead I fed
A;1.0andA;1.1into the conflict manager at this location, it throwsStrictConflictException.