Skip to content

Fix potential MQTT discovery race condition #17208

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.

Sign up for GitHub

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

Merged
balloob merged 3 commits into from
Oct 8, 2018
Merged

Fix potential MQTT discovery race condition #17208

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e2b37c
Fix potential MQTT discovery race condition
OttoWinter Oct 6, 2018
8b68ba6
Rename data key
OttoWinter Oct 7, 2018
245fb52
Merge branch 'dev' into fix-mqtt-discovery-race-condition
balloob Oct 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions homeassistant/components/mqtt/discovery.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
For more details about this component, please refer to the documentation at
https://home-assistant.io/components/mqtt/#discovery
"""
import asyncio
import json
import logging
import re
Expand Down Expand Up @@ -51,6 +52,7 @@
}

ALREADY_DISCOVERED = 'mqtt_discovered_components'
CONFIG_ENTRY_LOCK = 'mqtt_config_entry_lock'

@balloob balloob Oct 7, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Can you prefix this with DATA_ so it's more clear what it's used for.

CONFIG_ENTRY_IS_SETUP = 'mqtt_config_entry_is_setup'
MQTT_DISCOVERY_UPDATED = 'mqtt_discovery_updated_{}'
MQTT_DISCOVERY_NEW = 'mqtt_discovery_new_{}_{}'
Expand Down Expand Up @@ -119,14 +121,16 @@ async def async_device_message_received(topic, payload, qos):
return

config_entries_key = '{}.{}'.format(component, platform)
if config_entries_key not in hass.data[CONFIG_ENTRY_IS_SETUP]:
await hass.config_entries.async_forward_entry_setup(
config_entry, component)
hass.data[CONFIG_ENTRY_IS_SETUP].add(config_entries_key)
async with hass.data[CONFIG_ENTRY_LOCK]:
if config_entries_key not in hass.data[CONFIG_ENTRY_IS_SETUP]:
await hass.config_entries.async_forward_entry_setup(
config_entry, component)
hass.data[CONFIG_ENTRY_IS_SETUP].add(config_entries_key)

async_dispatcher_send(hass, MQTT_DISCOVERY_NEW.format(
component, platform), payload)

hass.data[CONFIG_ENTRY_LOCK] = asyncio.Lock()
hass.data[CONFIG_ENTRY_IS_SETUP] = set()

await mqtt.async_subscribe(
Expand Down