Backport #30844 to 2015.8 branch #30847
Merged
Conversation
This file contains 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
When configured to use a gitpython-based ext_pillar, salt-call --local (I don't have a master) was giving the error: Failed to checkout <branch> from git_pillar remote '<repo location>': remote ref does not exist regardless of whether the branch existed or not. Poking around in the cache directory, I found that the cloned repository had a remote named 'origin' set, but no fetch had ever been done, so 'git checkout' would always fail. It doesn't know about any branches yet. Adding the fetch here, immediately after creating the remote, resolves the problem. I'm not totally sure this is the _correct_ fix as I'm not familiar with this code, and this code is used in many situations, not just minced. But I believe it to be harmless in the worst case, a redundant fetch.
This prevents the master's maintenance process from attempting to run a fetch while GitBase.init_remotes() is in the process fetching a newly-added remote. We have proper locking in place, so there is no danger of a race condition, but this does suppress the warning generated when an update lock is in place at the time a fetch is attempted.
|
I can't reproduce the test failure on a cent7 box, and it doesn't appear related to this PR. |
cachedout
pushed a commit
that referenced
this pull request
Feb 3, 2016
Backport #30844 to 2015.8 branch
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.
See #30844.