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

[3006.x] Fix parallel state execution with Salt-SSH #66517

Merged
merged 2 commits into from
Jul 18, 2024

Conversation

lkubb
Copy link
Contributor

@lkubb lkubb commented May 14, 2024

What does this PR do?

Fixes a TypeError that was raised when executing parallel states via Salt-SSH (jid was unset, but the cache dir used for returning the result of a parallel execution depended on it).

What issues does this PR fix or reference?

Fixes: #66514
Fixes: #53538

Previous Behavior

Exits with retcode=0, shows sys.doc of state.pkg because of a TypeError (on <3007) / at least errors with retcode=1 and shows the stacktrace (>=3007).

New Behavior

Executes the states in parallel as requested.

Merge requirements satisfied?

[NOTICE] Bug fixes or features added to Salt require tests.

Commits signed with GPG?

Yes

@lkubb lkubb requested a review from a team as a code owner May 14, 2024 08:47
@lkubb lkubb requested review from felippeb and removed request for a team May 14, 2024 08:47
@salt-project-bot-prod-environment salt-project-bot-prod-environment bot changed the title Fix parallel state execution with Salt-SSH [3006.x] Fix parallel state execution with Salt-SSH May 14, 2024
salt/state.py Outdated Show resolved Hide resolved
salt/state.py Show resolved Hide resolved
@dwoz dwoz added the test:full Run the full test suite label Jul 17, 2024
@dwoz dwoz added this to the Sulfur v3006.9 milestone Jul 17, 2024
@dwoz dwoz merged commit 14edbcf into saltstack:3006.x Jul 18, 2024
614 checks passed
lkubb added a commit to lkubb/salt that referenced this pull request Oct 24, 2024
This was introduced by saltstack#66517

`__invocation_jid` is rewriten to `_State__invocation_id`, making
`cls(**init_kwargs)` fail with a TypeError (unexpected argument
`__invocation_jid` (this behavior is called name mangling).
lkubb added a commit to lkubb/salt that referenced this pull request Oct 24, 2024
This was introduced by saltstack#66517

`__invocation_jid` is rewriten to `_State__invocation_id`, making
`cls(**init_kwargs)` fail with a TypeError (unexpected argument
`__invocation_jid` (this behavior is called name mangling).
lkubb added a commit to lkubb/salt that referenced this pull request Oct 24, 2024
This was introduced by saltstack#66517

`__invocation_jid` is rewriten to `_State__invocation_id`, making
`cls(**init_kwargs)` fail with a TypeError (unexpected argument
`__invocation_jid` (this behavior is called name mangling).
dwoz pushed a commit that referenced this pull request Oct 25, 2024
This was introduced by #66517

`__invocation_jid` is rewriten to `_State__invocation_id`, making
`cls(**init_kwargs)` fail with a TypeError (unexpected argument
`__invocation_jid` (this behavior is called name mangling).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
test:full Run the full test suite
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants