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

Fix race on check MQTT subscriptions (#88117)

Browse Source 
* Check MQTT subscriptions under paho client lock

* Check simple subscriptions first

* Apply suggestion
This commit is contained in:
Jan Bouwhuis 2023-02-14 21:39:33 +01:00 committed by GitHub
parent 8529bcef2a
commit aaf8196997
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
homeassistant/components/mqtt/client.py
View File

@ -421,6 +421,12 @@ class MQTT:
retain=will_message.retain, retain=will_message.retain,
) )
def _is_active_subscription(self, topic: str) -> bool:
"""Check if a topic has an active subscription."""
return topic in self._simple_subscriptions or any(
other.topic == topic for other in self._wildcard_subscriptions
)
async def async_publish( async def async_publish(
self, topic: str, payload: PublishPayloadType, qos: int, retain: bool self, topic: str, payload: PublishPayloadType, qos: int, retain: bool
) -> None: ) -> None:
@ -544,11 +550,11 @@ class MQTT:
_raise_on_error(result) _raise_on_error(result)
return mid return mid
if any(other.topic == topic for other in self.subscriptions):
# Other subscriptions on topic remaining - don't unsubscribe.
return
async with self._paho_lock: async with self._paho_lock:
if self._is_active_subscription(topic):
# Other subscriptions on topic remaining - don't unsubscribe.
return
mid = await self.hass.async_add_executor_job(_client_unsubscribe, topic) mid = await self.hass.async_add_executor_job(_client_unsubscribe, topic)
await self._register_mid(mid) await self._register_mid(mid)