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

fix: Prevent a deadlock on provider error in py automation api #11595

Merged
merged 2 commits into from Dec 10, 2022

Conversation

elthariel
Copy link
Contributor

@elthariel elthariel commented Dec 8, 2022

Description

The rationale behind this change is explained in the linked issue. I haven't worked on the Checklist below, as I'd like to get an eye with more pulumi knownledge on the issue beforehand.

Also, reproducing deadlocks in unit tests is always quite tricky, so I'd rather not do it until I'm sure this is the proper approach

Fixes #11594

Checklist

  • I have added tests that prove my fix is effective or that my feature works
  • I have run make changelog and committed the changelog/pending/<file> documenting my change
  • Yes, there are changes in this PR that warrants bumping the Pulumi Service API version

@github-actions
Copy link

github-actions bot commented Dec 8, 2022

PR is now waiting for a maintainer to take action.

Note for the maintainer: Commands available:

  • /run-acceptance-tests - used to test run the acceptance tests for the project
  • /run-codegen - used to test the Pull Request against downstream codegen
  • /run-docs-gen - used to test the Pull Request against documentation generation

@pulumi-bot
Copy link
Contributor

pulumi-bot commented Dec 8, 2022

Changelog

[uncommitted] (2022-12-09)

Bug Fixes

  • [sdk/python] Fix a deadlock on provider-side error with automation api

@github-actions
Copy link

github-actions bot commented Dec 8, 2022

PR is now waiting for a maintainer to take action.

Note for the maintainer: Commands available:

  • /run-acceptance-tests - used to test run the acceptance tests for the project
  • /run-codegen - used to test the Pull Request against downstream codegen
  • /run-docs-gen - used to test the Pull Request against documentation generation

@elthariel elthariel force-pushed the fix/python_deadlock_on_rpcerror branch from d77f121 to 57f1096 Compare December 8, 2022 16:37
@github-actions
Copy link

github-actions bot commented Dec 8, 2022

PR is now waiting for a maintainer to take action.

Note for the maintainer: Commands available:

  • /run-acceptance-tests - used to test run the acceptance tests for the project
  • /run-codegen - used to test the Pull Request against downstream codegen
  • /run-docs-gen - used to test the Pull Request against documentation generation

@justinvp
Copy link
Member

justinvp commented Dec 9, 2022

/run-acceptance-tests
Please view the results of the acceptance tests Here

Copy link
Member

@justinvp justinvp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks, @elthariel! I'll get it merged after the acceptance tests have run.

@elthariel elthariel force-pushed the fix/python_deadlock_on_rpcerror branch from 57f1096 to 4e16d53 Compare December 9, 2022 22:13
@elthariel
Copy link
Contributor Author

I've noticed in the tests that there was a lint error, so I've updated my PR to fix the issue. I hope it doesn't mess with the acceptance tests

@justinvp
Copy link
Member

justinvp commented Dec 9, 2022

No worries, I'll re-run

@justinvp
Copy link
Member

justinvp commented Dec 9, 2022

/run-acceptance-tests

@elthariel
Copy link
Contributor Author

elthariel commented Dec 9, 2022

That's weird. It doesn't seems like it ran the tests again. At least I don't see anything in the list of workflows

@justinvp
Copy link
Member

That's weird. It doesn't seems like it ran the tests again.

Strange. Not sure why. (We've been tweaking how our CI is setup, so there may be some kinks to work out still). In any case, I ran the linter locally on your branch and it LGTM.

@justinvp
Copy link
Member

bors merge

@bors
Copy link
Contributor

bors bot commented Dec 10, 2022

Build succeeded:

@bors bors bot merged commit 717c310 into pulumi:master Dec 10, 2022
@elthariel elthariel deleted the fix/python_deadlock_on_rpcerror branch December 12, 2022 10:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Deadlock on provider error with python automation api
3 participants