Fix /jobs endpoint's return #23623
Closed
Fix /jobs endpoint's return #23623
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
jfindlay
added
Pending-Discussion
The /jobs endpoint apparently has a very odd return type. This fixes an issue found in Lothiraldan/saltpad#40
There was a patch (0d6691a) to add job returns to runners, but in so doing made syndics actually call "save_load" for each and every minion return. After looking through the code, the call paths aren't the same at all-- so IMO it doesn't make sense to consolidate these into a single function. This breaks them back out and fixes the sporratic "ExtraData" errors from msgpack.
This will help in the case where save_load is called multiple times. Although we cannot "merge" we can ensure that the one that is on disk is one of them-- not a mix of them.
jfindlay
added a commit
to jfindlay/salt
that referenced
this pull request
May 28, 2015
This commit is to be reverted when saltstack#23623 is merged.
jfindlay
added a commit
to jfindlay/salt
that referenced
this pull request
May 28, 2015
This commit is to be reverted when saltstack#23623 is merged.
jfindlay
added a commit
to jfindlay/salt
that referenced
this pull request
May 28, 2015
This commit is to be reverted when saltstack#23623 is merged.
jfindlay
added a commit
to jfindlay/salt
that referenced
this pull request
May 28, 2015
This commit is to be reverted when saltstack#23623 is merged.
jfindlay
added a commit
to jfindlay/salt
that referenced
this pull request
May 28, 2015
This commit is to be reverted when saltstack#23623 is merged.
|
Go Go Jenkins! |
|
Since work is not being currently done on this, I am closing it for the time being. When this is ready, please re-open it. |
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.
This is an attempt to merge #22857. I think I've isolated the cause of the ImmutableDict error to the changes to master.py in this commit, f923dea. The changes to client/mixins.py in the same commit also cause an ImmutableDict error in the test runner logs, but the integration.wheel.client.WheelModuleTest.test_cmd_async test actually succeeds. This commit, ac94683, is the best I can do so far to get the wheel test to pass.
@jacksontj, @s0undt3ch