jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-10 06:47:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure config entry setup lock is held when removing a config entry (#117086)

Browse Source
This commit is contained in:
J. Nick Koston 2024-05-10 19:47:26 -05:00 committed by GitHub
parent c74c2f3652
commit 2e60e09ba2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
homeassistant/components/airvisual/__init__.py
View File

@ -2,7 +2,6 @@
from __future__ import annotations from __future__ import annotations
import asyncio
from collections.abc import Mapping from collections.abc import Mapping
from datetime import timedelta from datetime import timedelta
from math import ceil from math import ceil
@ -307,15 +306,19 @@ async def async_migrate_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
# domain: # domain:
new_entry_data = {**entry.data} new_entry_data = {**entry.data}
new_entry_data.pop(CONF_INTEGRATION_TYPE) new_entry_data.pop(CONF_INTEGRATION_TYPE)
tasks = [
# Schedule the removal in a task to avoid a deadlock
# since we cannot remove a config entry that is in
# the process of being setup.
hass.async_create_background_task(
hass.config_entries.async_remove(entry.entry_id), hass.config_entries.async_remove(entry.entry_id),
hass.config_entries.flow.async_init( name="remove config legacy airvisual entry {entry.title}",
DOMAIN_AIRVISUAL_PRO, )
context={"source": SOURCE_IMPORT}, await hass.config_entries.flow.async_init(
data=new_entry_data, DOMAIN_AIRVISUAL_PRO,
), context={"source": SOURCE_IMPORT},
] data=new_entry_data,
await asyncio.gather(*tasks) )
# After the migration has occurred, grab the new config and device entries # After the migration has occurred, grab the new config and device entries
# (now under the `airvisual_pro` domain): # (now under the `airvisual_pro` domain):

15
homeassistant/config_entries.py
View File

@ -1621,15 +1621,16 @@ class ConfigEntries:
if (entry := self.async_get_entry(entry_id)) is None: if (entry := self.async_get_entry(entry_id)) is None:
raise UnknownEntry raise UnknownEntry
if not entry.state.recoverable: async with entry.setup_lock:
unload_success = entry.state is not ConfigEntryState.FAILED_UNLOAD if not entry.state.recoverable:
else: unload_success = entry.state is not ConfigEntryState.FAILED_UNLOAD
unload_success = await self.async_unload(entry_id) else:
unload_success = await self.async_unload(entry_id)
await entry.async_remove(self.hass) await entry.async_remove(self.hass)
del self._entries[entry.entry_id] del self._entries[entry.entry_id]
self._async_schedule_save() self._async_schedule_save()
dev_reg = device_registry.async_get(self.hass) dev_reg = device_registry.async_get(self.hass)
ent_reg = entity_registry.async_get(self.hass) ent_reg = entity_registry.async_get(self.hass)