Fix naive fileserver map diff algorithm #33875
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
Naively comparing sorted dict keys does not guarantee that maps are equal. We must compare mtimes for filenames in case keys are the same to make sure there isnt a modified file.
|
Go Go Jenkins! |
1 similar comment
|
Go Go Jenkins! |
|
@terminalmage Could you take a look at this? |
| :codeauthor: :email:`Joao Mesquita <jmesquita@sangoma.com>` | ||
| ''' | ||
|
|
||
| # Import pytohn libs |
terminalmage
added
ZZZ[Done]-back-ported-bf
|
This needs to be backported to 2015.8 once fixes have been made. |
|
Just a bump here @jmesquita - we'd love to get this in once you've addressed the comments above. |
|
@jmesquita Will you be able to get back to this to make the requested changes? |
|
I think we can make these fixes after the merge. I'm going to get this in and then fix it up. |
cachedout
pushed a commit
to cachedout/salt
that referenced
this pull request
Jul 27, 2016
cachedout
pushed a commit
that referenced
this pull request
Jul 27, 2016
|
#34999 will need to be backported as well. |
rallytime
added
ZZZ[Done]-back-ported-bf
rallytime
pushed a commit
to rallytime/salt
that referenced
this pull request
Jul 27, 2016
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.
What does this PR do?
Fixes fileserver map diffing algorithm
Previous Behavior
Fired fileserver event would say changed is False in case a file was modified and none was addded/removed.
New Behavior
Changed flag is now correct on the event
Tests written?
Yes
Naively comparing sorted dict keys does not guarantee that maps are equal. We
must compare mtimes for filenames in case keys are the same to make sure there
isnt a modified file.