Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Checking for jid before returning data #55216

Merged
merged 6 commits into from
Dec 29, 2019
Merged

Checking for jid before returning data #55216

merged 6 commits into from
Dec 29, 2019

Conversation

brejoc
Copy link
Contributor

@brejoc brejoc commented Nov 6, 2019

What does this PR do?

Seems raw can have returns for the same minion, but an other job. In order to not return resutls from the wrong job, we need to check for the jid.

What issues does this PR fix or reference?

#50927

This is the successor of #52459.

Previous Behavior

Wrong job results might be returned. Please take a look at #50927

New Behavior

Only the correct jobs results should be returned.

Tests written?

Yes

Commits signed with GPG?

Yes

Seems raw can have returns for the same minion, but an other job. In
order to not return resutls from the wrong job, we need to check for the
jid.
@brejoc brejoc requested a review from a team as a code owner November 6, 2019 14:47
@ghost ghost requested a review from Ch3LL November 6, 2019 14:47
@brejoc brejoc changed the title Master get full returns jid fix Checking for jid before returning data Nov 6, 2019
@brejoc
Copy link
Contributor Author

brejoc commented Nov 26, 2019

@Ch3LL Could you please take a look here? #52459 (comment)
Thanks!

Copy link
Contributor

@Ch3LL Ch3LL left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure what i did wrong previously, but when i patch my local setup i dont see the issue anymore :) thanks for this

@Ch3LL
Copy link
Contributor

Ch3LL commented Dec 17, 2019

ping @brejoc looks like there is a conflict. mind resolving that? if not I can help out

@brejoc
Copy link
Contributor Author

brejoc commented Dec 17, 2019

@Ch3LL Thanks for looking into this again!

Seems like the conflicting imports where just removed, so I did the same here. Conflict is solved. Let's see if the tests are still passing for this.

@dwoz dwoz merged commit cac378c into saltstack:master Dec 29, 2019
@brejoc
Copy link
Contributor Author

brejoc commented Jan 2, 2020

@dwoz Thanks for taking care of this! 🙇‍♂️

@brejoc brejoc deleted the master-get-full-returns-jid-fix branch January 2, 2020 13:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants