home-assistant/core
1
0
Fork 1
mirror of https://github.com/home-assistant/core.git synced 2025-07-29 18:28:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix mqtt timer churn (#117885)

Browse Source 
Borrows the same design from homeassistant.helpers.storage to avoid
rescheduling the timer every time async_schedule is called if a timer
is already running.

Instead of the timer fires too early it gets rescheduled for the time
we wanted it. This avoids 1000s of timer add/cancel during startup
This commit is contained in:
J. Nick Koston
2024-05-21 15:05:33 -10:00
committed by GitHub
parent 1800a60a6d
commit f429bfa903
2 changed files with 39 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/components/mqtt/test_init.py
View File

@ -1839,6 +1839,7 @@ async def test_restore_all_active_subscriptions_on_reconnect(
mqtt_client_mock: MqttMockPahoClient,
mqtt_mock_entry: MqttMockHAClientGenerator,
record_calls: MessageCallbackType,
freezer: FrozenDateTimeFactory,
) -> None:
"""Test active subscriptions are restored correctly on reconnect."""
mqtt_mock = await mqtt_mock_entry()
@ -1849,7 +1850,8 @@ async def test_restore_all_active_subscriptions_on_reconnect(
await mqtt.async_subscribe(hass, "test/state", record_calls, qos=1)
await mqtt.async_subscribe(hass, "test/state", record_calls, qos=0)
await hass.async_block_till_done()
async_fire_time_changed(hass, utcnow() + timedelta(seconds=3)) # cooldown
freezer.tick(3)
async_fire_time_changed(hass) # cooldown
await hass.async_block_till_done()
# the subscribtion with the highest QoS should survive
@ -1865,15 +1867,18 @@ async def test_restore_all_active_subscriptions_on_reconnect(
mqtt_client_mock.on_disconnect(None, None, 0)
await hass.async_block_till_done()
mqtt_client_mock.on_connect(None, None, None, 0)
async_fire_time_changed(hass, utcnow() + timedelta(seconds=3)) # cooldown
freezer.tick(3)
async_fire_time_changed(hass) # cooldown
await hass.async_block_till_done()
expected.append(call([("test/state", 1)]))
assert mqtt_client_mock.subscribe.mock_calls == expected
async_fire_time_changed(hass, utcnow() + timedelta(seconds=3)) # cooldown
freezer.tick(3)
async_fire_time_changed(hass) # cooldown
await hass.async_block_till_done()
async_fire_time_changed(hass, utcnow() + timedelta(seconds=3)) # cooldown
freezer.tick(3)
async_fire_time_changed(hass) # cooldown
await hass.async_block_till_done()
@ -1889,6 +1894,7 @@ async def test_subscribed_at_highest_qos(
mqtt_client_mock: MqttMockPahoClient,
mqtt_mock_entry: MqttMockHAClientGenerator,
record_calls: MessageCallbackType,
freezer: FrozenDateTimeFactory,
) -> None:
"""Test the highest qos as assigned when subscribing to the same topic."""
mqtt_mock = await mqtt_mock_entry()
@ -1897,18 +1903,21 @@ async def test_subscribed_at_highest_qos(
await mqtt.async_subscribe(hass, "test/state", record_calls, qos=0)
await hass.async_block_till_done()
async_fire_time_changed(hass, utcnow() + timedelta(seconds=5)) # cooldown
freezer.tick(5)
async_fire_time_changed(hass) # cooldown
await hass.async_block_till_done()
assert ("test/state", 0) in help_all_subscribe_calls(mqtt_client_mock)
mqtt_client_mock.reset_mock()
async_fire_time_changed(hass, utcnow() + timedelta(seconds=5)) # cooldown
freezer.tick(5)
async_fire_time_changed(hass) # cooldown
await hass.async_block_till_done()
await hass.async_block_till_done()
await mqtt.async_subscribe(hass, "test/state", record_calls, qos=1)
await mqtt.async_subscribe(hass, "test/state", record_calls, qos=2)
await hass.async_block_till_done()
async_fire_time_changed(hass, utcnow() + timedelta(seconds=5)) # cooldown
freezer.tick(5)
async_fire_time_changed(hass) # cooldown
await hass.async_block_till_done()
# the subscribtion with the highest QoS should survive
assert help_all_subscribe_calls(mqtt_client_mock) == [("test/state", 2)]