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

[2018.3] Fix mine.get not returning data #48765

Merged
merged 1 commit into from Jul 27, 2018

Conversation

Projects
None yet
5 participants
@FedericoCeratto
Contributor

FedericoCeratto commented Jul 25, 2018

What does this PR do?

Implements a workaround for #48020
Ported from openSUSE/salt#102

What issues does this PR fix or reference?

#48020

Previous Behavior

mine.get would return no nodes

New Behavior

mine.get returns the correct nodes

Tests written?

No

Commits signed with GPG?

No

@FedericoCeratto FedericoCeratto requested a review from saltstack/team-core as a code owner Jul 25, 2018

@salt-jenkins salt-jenkins requested a review from saltstack/team-suse Jul 25, 2018

@gtmanfred gtmanfred requested a review from terminalmage Jul 25, 2018

@gtmanfred

This was added in #44890

I would like @terminalmage to look at it, since that was originally added by him.

@terminalmage

This is a good change. I mistook the cause for an error that is fired later on in the function when salt.cmd is used.

To fix the actual issue I was trying to solve, can you please add the following after pki_cache_fn is defined? (line 243):

try:
    os.makedirs(os.path.dirname(pki_cache_fn))
except OSError:
    pass

blind-review

@FedericoCeratto FedericoCeratto force-pushed the FedericoCeratto:fix_mine.get_not_returning_data branch from eee36c4 to 0214e8f Jul 27, 2018

@FedericoCeratto FedericoCeratto force-pushed the FedericoCeratto:fix_mine.get_not_returning_data branch from 0214e8f to 7183a6e Jul 27, 2018

@FedericoCeratto

This comment has been minimized.

Contributor

FedericoCeratto commented Jul 27, 2018

Updated and rebased.

@rallytime rallytime requested a review from terminalmage Jul 27, 2018

@terminalmage

Excellent!

@rallytime rallytime merged commit bd67d2a into saltstack:2018.3 Jul 27, 2018

4 of 8 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has failed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has failed
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

@kiall kiall referenced this pull request Jul 30, 2018

Merged

Workaround for #48020 #103

@cachedout

This comment has been minimized.

Contributor

cachedout commented Aug 2, 2018

@terminalmage This is a partial revert of #44890.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment