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 Downloader YAML import #114844

Merged
merged 4 commits into from
Apr 5, 2024
Merged

Conversation

joostlek
Copy link
Member

@joostlek joostlek commented Apr 4, 2024

Proposed change

Avoid deadlock on import of config YAML.

Type of change

  • Dependency upgrade
  • Bugfix (non-breaking change which fixes an issue)
  • New integration (thank you!)
  • New feature (which adds functionality to an existing integration)
  • Deprecation (breaking change to happen in the future)
  • Breaking change (fix/feature causing existing functionality to break)
  • Code quality improvements to existing code or addition of tests

Additional information

  • This PR fixes or closes issue: fixes #
  • This PR is related to issue:
  • Link to documentation pull request:

Checklist

  • The code change is tested and works locally.
  • Local tests pass. Your PR cannot be merged unless tests pass
  • There is no commented out code in this PR.
  • I have followed the development checklist
  • I have followed the perfect PR recommendations
  • The code has been formatted using Ruff (ruff format homeassistant tests)
  • Tests have been added to verify that the new code works.

If user exposed functionality or configuration variables are added/changed:

If the code communicates with devices, web services, or third-party tools:

  • The manifest file has all fields filled out correctly.
    Updated and included derived files by running: python3 -m script.hassfest.
  • New or updated dependencies have been added to requirements_all.txt.
    Updated by running python3 -m script.gen_requirements_all.
  • For the updated dependencies - a link to the changelog, or at minimum a diff between library versions is added to the PR description.
  • Untested files have been added to .coveragerc.

To help with the load of incoming pull requests:

@home-assistant
Copy link

home-assistant bot commented Apr 4, 2024

Hey there @erwindouna, mind taking a look at this pull request as it has been labeled with an integration (downloader) you are listed as a code owner for? Thanks!

Code owner commands

Code owners of downloader can trigger bot actions by commenting:

  • @home-assistant close Closes the pull request.
  • @home-assistant rename Awesome new title Renames the pull request.
  • @home-assistant reopen Reopen the pull request.
  • @home-assistant unassign downloader Removes the current integration label and assignees on the pull request, add the integration domain after the command.
  • @home-assistant add-label needs-more-information Add a label (needs-more-information, problem in dependency, problem in custom component) to the pull request.
  • @home-assistant remove-label needs-more-information Remove a label (needs-more-information, problem in dependency, problem in custom component) on the pull request.

@MartinHjelmare MartinHjelmare removed this from the 2024.4.1 milestone Apr 4, 2024
@MartinHjelmare MartinHjelmare marked this pull request as draft April 4, 2024 22:39
@joostlek joostlek added this to the 2024.4.1 milestone Apr 5, 2024
@joostlek joostlek changed the title Make downloader service call async Fix Downloader YAML import Apr 5, 2024
@joostlek joostlek marked this pull request as ready for review April 5, 2024 09:22
Copy link
Member

@frenck frenck left a comment

Choose a reason for hiding this comment

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

Thanks @joostlek 👍

../Frenck

@frenck frenck merged commit 772d9f7 into home-assistant:dev Apr 5, 2024
24 checks passed
@joostlek joostlek deleted the downloader-fix-2 branch April 5, 2024 09:33
@@ -43,6 +43,13 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
if DOMAIN not in config:
return True

hass.async_create_task(_async_import_config(hass, config), eager_start=True)
Copy link
Member

Choose a reason for hiding this comment

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

I don't think eager start makes sense since the component needs to be setup before the config entry is setup, and the config entry will be setup at the end of the config flow. We know that the task will need to yield to the loop to wait for the component setup to complete if we use an eager task. The whole point of this task is that we want it to run in a later iteration of the event loop to avoid a deadlock.

Copy link
Member Author

Choose a reason for hiding this comment

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

Bdraco had it in his comment, do we want to remove it before the hotfix cut?

Copy link
Member

Choose a reason for hiding this comment

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

It's not a bug it's just confusing.

frenck pushed a commit that referenced this pull request Apr 5, 2024
@frenck frenck mentioned this pull request Apr 5, 2024
@github-actions github-actions bot locked and limited conversation to collaborators Apr 6, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants