Port #51499 to master #55398
Merged
Port #51499 to master #55398
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
ghost
requested a review
from 
|
this looks like it just needs the WIP title removed and all other checks pass - but also needs a rebase, is that right @waynew ? |
when lazyLoader was getting instantiated from inside already lazyloaded modules (ie state), pillar/grain (and probably other) globals were already populated. In this case they weren't getting dereferenced properly when wrapped via the NamespacedDict wrapper, causing an infinite loop. This should fix that scenario. Fixes saltstack#50655 (comment)
oeuftete
force-pushed
the
port-51499-to-master
branch
from
4fb06f8 to
2202fed
Compare
|
I've rebased. Note that the original change to the main code base was removed, since it looked not applicable with refactors to the loader since. The added tests have been left, though, and appeared to be passing (before this rebase, anyway.) |
|
@Akm0d It looks like you might be able to assess whether no change in the loader here is appropriate, based on #54878 (comment)? |
dwoz
approved these changes
Dec 5, 2019
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.
TODOs:
What does this PR do?
Ports #51499 to master. See that PR for additional information.
It looks like the original loader changes are no longer necessary with refactoring that has occurred since the original issue was addressed. The original author's tests look like they will show whether that is the case.
Commits signed with GPG?
No.