salt/state.py: set chunk['order'] = 0' with order: first'; fixes #24744
#34769
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
service state integration tests
fix some problems with the gem module integration tests
states.pkg int tests: skip if pkg mgr unavailable
This change did not make it into 2015.5.11, and it is not certain at this time whether or not we will do a 2015.5.12.
This time win_servermanager
…er_test Fixing more stupid unit tests
These all assert directly against mock objects. They're pointless.
…_tests Remove matcher tests
…t_stacktrace Fix another unit test stacktrace in pkg_resource
Support syncing pillar modules to masterless minions
…anged Update versionchanged directive
Fix broken locate.locate function
Conflicts: - salt/modules/saltutil.py - salt/states/archive.py
This is done for API compatibility
This is done for API compatibility
This is done for API compatibility
This is done for API compatibility
This is done for API compatibility
This is done for API compatibility
This is done for API compatibility
This resolves an edge case in which the "fromrepo" argument is passed to the pkg.uptodate state. We pass through the kwargs to pkg.upgrade, but do not pass the same kwargs to list_upgrades, resulting in inconsistent results.
Check that mysqladmin exists before running mysql integration tests
* Better error handling for __virtual__ in dockerng module * Modify lodaer global test to use populated dunders This prevents a number of errors in the error log and makes for a more robust test IMHO * Lint saltstack#34644
Clarifies the proper way to reference states
This reverts commit f45dbe8.
Revert "Modify lodaer global test to use populated dunders"
…ean-values Bugfix: Zypper `pkg.list_products` returns False on some empty values (2015.8)
fix second run problems with pkg.installed using sources
Add output_file option to master config docs
Remove dict.update and always use loop because this is failing for NamespacedDictWrapper.
Back-port saltstack#34726 to 2015.8
There's a race condition in here somewhere. Disabling and tracking issue elsewhere.
|
Note: this is against 2014.7 and is a clean forward merge to 2015.5, 2015.8 (where I ran into the issue), 2016.3 (where I tested the fix), and develop. The version in 2014.1 is slightly different and it would have to be manually backported. |
…urn jid into the jid list table.
…up/2015.8 Bugfix: Startup states on minions are not being written to mysql returner
|
@junovitch We no longer do merge forwards from 2014.7. Could you please close this and re-open it against 2015.8? |
…ltstack#24744 Currently the `order: first' keyword executes later states without order options. Consider a test case such as: ```SaltStack sleep 1: cmd.run: - order: first sleep 2: cmd.run sleep 3: cmd.run sleep 4: cmd.run: - order: last ``` The contents of each chunk dictionary at runtime show that the 'first' state is not evaluated to 'first'. {'name': 'sleep 4', 'state': 'cmd', '__id__': 'sleep 4', 'fun': 'run', '__env__': 'base', '__sls__': u'test', 'order': 1010100} {'name': 'sleep 2', 'state': 'cmd', '__id__': 'sleep 2', 'fun': 'run', '__env__': 'base', '__sls__': u'test', 'order': 10000} {'name': 'sleep 3', 'state': 'cmd', '__id__': 'sleep 3', 'fun': 'run', '__env__': 'base', '__sls__': u'test', 'order': 10001} {'name': 'sleep 1', 'state': 'cmd', '__id__': 'sleep 1', 'fun': 'run', '__env__': 'base', '__sls__': u'test', 'order': 10100}
|
Closing per @cachedout. I was following the "create your branch from the oldest release branch that contains the bug" from https://docs.saltstack.com/en/latest/topics/development/contributing.html here. A pull request against 2015.8 is open at #34803 |
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 behavior of 'order: first' (explain in further detail in the commit message and below)
What issues does this PR fix or reference?
#24744 and the later (closed) #26278
Previous Behavior
Explained in commit message.
New Behavior
First goes first :)
Tests written?
No. Tested manually before removing the debug logging and committing.
Please review Salt's Contributing Guide for best practices.
Commit Message
salt/state.py: set
chunk['order'] = 0' withorder: first'; fixes #24744Currently the `order: first' keyword executes later states without order
options. Consider a test case such as:
The contents of each chunk dictionary at runtime show that the 'first' state
is not evaluated to 'first'.
{'name': 'sleep 4', 'state': 'cmd', 'id': 'sleep 4', 'fun': 'run', 'env': 'base', 'sls': u'test', 'order': 1010100}
{'name': 'sleep 2', 'state': 'cmd', 'id': 'sleep 2', 'fun': 'run', 'env': 'base', 'sls': u'test', 'order': 10000}
{'name': 'sleep 3', 'state': 'cmd', 'id': 'sleep 3', 'fun': 'run', 'env': 'base', 'sls': u'test', 'order': 10001}
{'name': 'sleep 1', 'state': 'cmd', 'id': 'sleep 1', 'fun': 'run', 'env': 'base', 'sls': u'test', 'order': 10100}