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

Fix infinite recursion in state compiler for prereq of SLSs #29067

Merged
merged 3 commits into from Nov 30, 2015

Conversation

Projects
None yet
5 participants
@jacksontj
Contributor

jacksontj commented Nov 20, 2015

No description provided.

optix2000 and others added some commits Nov 20, 2015

Correctly resolve requisite_in for SLS requisites
Fixes #29066

Basically SLS requisites were being skipped because requisite_in didn't know that SLS was a reserved word. As such the requisite wasn't added before being handed to `run_chunks`. This would work some times, but if the state being being prereqed was run first, this would lead to infinite recursion.

@jacksontj jacksontj closed this Nov 23, 2015

@jacksontj jacksontj reopened this Nov 23, 2015

@jacksontj

This comment has been minimized.

Show comment
Hide comment
@jacksontj

jacksontj Nov 23, 2015

Contributor

Tests are passing on ubuntu, didn't run on either centos version. Re-triggering a build.

Contributor

jacksontj commented Nov 23, 2015

Tests are passing on ubuntu, didn't run on either centos version. Re-triggering a build.

@jacksontj

This comment has been minimized.

Show comment
Hide comment
@jacksontj

jacksontj Nov 23, 2015

Contributor

@jfindlay Tests are passing :)

Contributor

jacksontj commented Nov 23, 2015

@jfindlay Tests are passing :)

@jacksontj

This comment has been minimized.

Show comment
Hide comment
@jacksontj

jacksontj Nov 24, 2015

Contributor

@cachedout not sure who wants to review this?

Contributor

jacksontj commented Nov 24, 2015

@cachedout not sure who wants to review this?

@cachedout

This comment has been minimized.

Show comment
Hide comment
@cachedout

cachedout Nov 24, 2015

Contributor

@jacksontj I was asked by @thatch45 to hold on this one until after 2015.8.2. I'll see if he's around and can comment further.

Contributor

cachedout commented Nov 24, 2015

@jacksontj I was asked by @thatch45 to hold on this one until after 2015.8.2. I'll see if he's around and can comment further.

@thatch45

This comment has been minimized.

Show comment
Hide comment
@thatch45

thatch45 Nov 24, 2015

Member

Thanks @jacksontj ! If it is alright I would like to wait a few more days on this one until we can tag the next point release. I don't like merging state system fixes/changes right before a point release.

Member

thatch45 commented Nov 24, 2015

Thanks @jacksontj ! If it is alright I would like to wait a few more days on this one until we can tag the next point release. I don't like merging state system fixes/changes right before a point release.

@jacksontj

This comment has been minimized.

Show comment
Hide comment
@jacksontj

jacksontj Nov 24, 2015

Contributor

We can wait, although it is a bug fix ;) If we wait I guess it'll just make it into 2015.8.3 then.

Contributor

jacksontj commented Nov 24, 2015

We can wait, although it is a bug fix ;) If we wait I guess it'll just make it into 2015.8.3 then.

@thatch45

This comment has been minimized.

Show comment
Hide comment
@thatch45

thatch45 Nov 24, 2015

Member

right, thanks :)

Member

thatch45 commented Nov 24, 2015

right, thanks :)

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

Merge pull request #29067 from jacksontj/2015.8
Fix infinite recursion in state compiler for prereq of SLSs

@cachedout cachedout merged commit d651d71 into saltstack:2015.8 Nov 30, 2015

4 of 6 checks passed

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