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

2015.5 branch: Fix traceback when 2015.8 git ext_pillar config schema used #27876

Merged
merged 1 commit into from Oct 13, 2015

Conversation

Projects
None yet
3 participants
@terminalmage
Member

terminalmage commented Oct 12, 2015

If the new gitfs-backed git_pillar configuration schema is used, the
Maintenance process will endlessly crash and restart itself because of a
traceback raised when parsing the ext_pillar configuration. This commit
fixes that by catching the AttributeError and logging an error to the
master log.

2015.5 branch: Fix traceback when 2015.8 git ext_pillar config schema…
… used

If the new gitfs-backed git_pillar configuration schema is used, the
Maintenance process will endlessly crash and restart itself because of a
traceback raised when parsing the ext_pillar configuration. This commit
fixes that by catching the AttributeError and logging an error to the
master log.
@jfindlay

This comment has been minimized.

Show comment
Hide comment
@jfindlay

jfindlay Oct 12, 2015

Contributor

@terminalmage, should this change not be merged into 2015.8 and beyond?

Contributor

jfindlay commented Oct 12, 2015

@terminalmage, should this change not be merged into 2015.8 and beyond?

@terminalmage

This comment has been minimized.

Show comment
Hide comment
@terminalmage

terminalmage Oct 12, 2015

Member

It will likely conflict when merging forward as the init_git_pillar code in masterapi.py has undergone changes in 2015.8. If it does conflict, the 2015.8 side of the conflict should be assumed to be correct, and the 2015.5 version should be ignored.

I've notified @basepi about this potential conflict and will work with him to resolve it when we next merge forward after this PR is merged.

Member

terminalmage commented Oct 12, 2015

It will likely conflict when merging forward as the init_git_pillar code in masterapi.py has undergone changes in 2015.8. If it does conflict, the 2015.8 side of the conflict should be assumed to be correct, and the 2015.5 version should be ignored.

I've notified @basepi about this potential conflict and will work with him to resolve it when we next merge forward after this PR is merged.

@jfindlay

This comment has been minimized.

Show comment
Hide comment
@jfindlay

jfindlay Oct 12, 2015

Contributor

Cool, thanks.

Contributor

jfindlay commented Oct 12, 2015

Cool, thanks.

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

Merge pull request #27876 from terminalmage/git_pillar-AttributeError…
…-2015.5

2015.5 branch: Fix traceback when 2015.8 git ext_pillar config schema used

@cachedout cachedout merged commit 41cccb3 into saltstack:2015.5 Oct 13, 2015

5 checks passed

default Merged build finished.
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #10198 — SUCCESS
Details
jenkins/salt-pr-linode-ubuntu14.04-n Salt PR - Linode Ubuntu 14.04 #1266 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #9911 — SUCCESS
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #8740 — SUCCESS
Details

@terminalmage terminalmage deleted the terminalmage:git_pillar-AttributeError-2015.5 branch Nov 30, 2015

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