tree.repo: fix race condition when walking subrepos #4505
Merged
Conversation
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
skshetry
commented
Aug 31, 2020
|
|
||
|
|
||
| @pytest.mark.parametrize("traverse_subrepos", [True, False]) | ||
| def test_walk_nested_subrepos(tmp_dir, dvc, scm, traverse_subrepos): |
Collaborator
Author
There was a problem hiding this comment.
The tests setup is a bit lengthy.
Collaborator
Author
There was a problem hiding this comment.
Could not reduce it. Tell me if it's confusing.
skshetry
changed the title
Collaborator
Author
|
To clarify: the bug might affect any directory that contains at least a sub-repo and other files/dirs when |
efiop
approved these changes
Sep 1, 2020
Contributor
|
Good catch! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
The subrepos were not removed from getting traversed, due to which it was causing race conditions, as we were expecting
different directories to be traversed but as subrepos were still there,
next(repo_walk)could consume from the subrepo instead of the expected directories.This was too hard to debug 😥.
❗ I have followed the Contributing to DVC checklist.
📖 If this PR requires documentation updates, I have created a separate PR (or issue, at least) in dvc.org and linked it here.
Thank you for the contribution - we'll try to review it as soon as possible. 🙏