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 stalls in config flow of APCUPSD #108931

Merged

Conversation

yuxincs
Copy link
Contributor

@yuxincs yuxincs commented Jan 27, 2024

Proposed change

This PR fixes the stalls in config flow of APCUPSD integration, where we were mistakenly calling hass.async_block_till_done() after requesting initial coordinator refresh.

hass.async_block_till_done() waits for everything in HASS, not just the the integration itself (and it is usually only used in test code). Therefore, this call will probably never return once HASS startup finishes. We were unable to reproduce this since we were testing on new installations, but users with existing installations have reported such an issue when they were adding an apcupsd integration (see #108221).

Credit goes to @dom42 who was able to reproduce this locally and found the culprit.

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

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:

@@ -52,9 +52,8 @@ async def async_step_user(

# Test the connection to the host and get the current status for serial number.
coordinator = APCUPSdCoordinator(self.hass, host, port)
Copy link
Member

@bdraco bdraco Jan 27, 2024

Choose a reason for hiding this comment

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

Usually we don't create coordinators in config flows.

In a future PR it would be nice to replace this with await aioapcaccess.request_status(host, port) and trap the exceptions instead

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sounds good, will do!

await coordinator.async_request_refresh()
await self.hass.async_block_till_done()
Copy link
Member

Choose a reason for hiding this comment

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

This will wait for everything, not just the integration so it will likely never finish once startup has completed.

Copy link
Contributor Author

@yuxincs yuxincs Jan 27, 2024

Choose a reason for hiding this comment

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

Huh, that makes sense now! Thanks for the explanations!

Updated the PR description!

@yuxincs yuxincs changed the title Fix deadlock in config flow of APCUPSD Fix stalls in config flow of APCUPSD Jan 27, 2024
@joostlek joostlek merged commit 16a90f8 into home-assistant:dev Jan 27, 2024
23 checks passed
@yuxincs yuxincs deleted the yuxincs/apcupsd-fix-config-flow branch January 27, 2024 13:23
@github-actions github-actions bot locked and limited conversation to collaborators Jan 28, 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.

Adding the APC UPS Daemon (apcupsd) integration fails during configuration
4 participants