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

Add state check to config entry setup to ensure it cannot be setup twice #117193

Merged
merged 3 commits into from May 10, 2024

Conversation

bdraco
Copy link
Member

@bdraco bdraco commented May 10, 2024

Proposed change

The config entry manager has a check to make sure the config entry state was in the NOT_LOADED state, but since the entry can retry setup and does no go through the manager, we should check in the entry async_setup to verify that the entry is not already loaded or in the progress of setting up before allowing setup to proceed

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:

The config entry manager had a check to make sure the state
was in the NOT_LOADED state, but since the entry can retry
setup we should check in the entry async_setup to verify
that the entry is not already loaded or in the progress
of setting up before allowing setup to proceed
@bdraco bdraco marked this pull request as ready for review May 10, 2024 22:09
@bdraco bdraco requested review from StevenLooman and a team as code owners May 10, 2024 22:09
@bdraco
Copy link
Member Author

bdraco commented May 10, 2024

all good after many restarts

@bdraco bdraco merged commit c74c2f3 into dev May 10, 2024
38 checks passed
@bdraco bdraco deleted the setup_loaded_check branch May 10, 2024 22:09
@bdraco
Copy link
Member Author

bdraco commented May 10, 2024

thanks

@thecode
Copy link
Member

thecode commented May 10, 2024

I assume this can be added to the next milestone?

):
raise OperationNotAllowed(
f"The config entry {self.title} ({self.domain}) with entry_id"
f" {self.entry_id} cannot be setup because is already loaded in the"
Copy link
Contributor

Choose a reason for hiding this comment

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

nit:

Suggested change
f" {self.entry_id} cannot be setup because is already loaded in the"
f" {self.entry_id} cannot be set up because is already loaded in the"

Taking another look, maybe also:

Suggested change
f" {self.entry_id} cannot be setup because is already loaded in the"
f" {self.entry_id} cannot be set up because it is already loaded in the"

Copy link
Member Author

Choose a reason for hiding this comment

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

I'll do a followup as I copied the message from the other location

Copy link
Member Author

Choose a reason for hiding this comment

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

I'm adding a lock check to async_setup and async_unload to ensure we never run them without the lock in #117214. I fixed the text there

@bdraco
Copy link
Member Author

bdraco commented May 10, 2024

I'm a little nervous about back porting it since it changes the failure mode a bit but it's probably ok

@github-actions github-actions bot locked and limited conversation to collaborators May 12, 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.

None yet

3 participants