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

Back-port #49759 to 2018.3 #49786

Merged
merged 1 commit into from Sep 26, 2018

Conversation

Projects
None yet
2 participants
@rallytime
Copy link
Contributor

commented Sep 26, 2018

Back-port #49759 to 2018.3

state.orch: generate jid if missing
via salt-run cli a jid is generated in RunnerClient via gen_async_pub
and passed on via orchestration_jid if the func is orchestration, but in
other callsites this jid generation doesn't happen (ie, the netapi client,
since it directly invokes AsyncMixins.cmd_sync). There seems to be no
obvious way to correct this at the netapi level so we just default to
a new jid if orch_jid is missing. there may be other calling contexts
where this could have been occurring.

@rallytime rallytime merged commit 04e5869 into saltstack:2018.3 Sep 26, 2018

5 of 10 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has failed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has failed
Details
jenkins/pr/py2-centos-7 running py2-centos-7...
Details
jenkins/pr/py3-ubuntu-1604 running py3-ubuntu-1604...
Details
WIP ready for review
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details

@rallytime rallytime deleted the rallytime:bp-49759 branch Sep 26, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.