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

Fixes to salt scheduler in 2015.5, ensuring that return_job is only used on minion scheduler #28731

Merged
merged 1 commit into from Nov 13, 2015

Conversation

Projects
None yet
2 participants
@garethgreenaway
Member

garethgreenaway commented Nov 10, 2015

Fixing the salt scheduler so that it only attempts to return the job data to the master if the scheduled job is running from a minion's scheduler. #27392

Fixing the salt scheduler so that it only attempts to return the job …
…data to the master if the scheduled job is running from a minion's scheduler.
@cachedout

This comment has been minimized.

Show comment
Hide comment
@cachedout

cachedout Nov 11, 2015

Contributor

Go Go Jenkins!

Contributor

cachedout commented Nov 11, 2015

Go Go Jenkins!

channel.send(load)
# Only attempt to return data to the master
# if the scheduled job is running on a minion.
if '__role' in self.opts and self.opts['__role'] == 'minion':

This comment has been minimized.

@cachedout

cachedout Nov 11, 2015

Contributor

Hmm. Should we allow syndics as well?

@cachedout

cachedout Nov 11, 2015

Contributor

Hmm. Should we allow syndics as well?

This comment has been minimized.

@garethgreenaway

garethgreenaway Nov 13, 2015

Member

Sorry, I missed this. Good question, the reason for this fix is that the master has no master_uri configured, so when it tries to return a job running on the master the exception pops up. I'm not overly familiar with syndics, but given that they're salt masters I would think it would be the same issue as running a job on a regular master.

@garethgreenaway

garethgreenaway Nov 13, 2015

Member

Sorry, I missed this. Good question, the reason for this fix is that the master has no master_uri configured, so when it tries to return a job running on the master the exception pops up. I'm not overly familiar with syndics, but given that they're salt masters I would think it would be the same issue as running a job on a regular master.

@cachedout

This comment has been minimized.

Show comment
Hide comment
@cachedout

cachedout Nov 11, 2015

Contributor

@garethgreenaway Please see my in-line comment on this one.

Contributor

cachedout commented Nov 11, 2015

@garethgreenaway Please see my in-line comment on this one.

cachedout added a commit that referenced this pull request Nov 13, 2015

Merge pull request #28731 from garethgreenaway/27392_2015_5_scheduler…
…_return_job_master

Fixes to salt scheduler in 2015.5, ensuring that return_job is only used on minion scheduler

@cachedout cachedout merged commit bed45f4 into saltstack:2015.5 Nov 13, 2015

5 checks passed

default Merged build finished.
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #11112 — SUCCESS
Details
jenkins/salt-pr-linode-ubuntu14.04-n Salt PR - Linode Ubuntu 14.04 #2181 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #10822 — SUCCESS
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #9651 — SUCCESS
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment