Skip to content

Sonos fix media player join to avoid race condition #159106

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
joostlek merged 1 commit into from
Dec 15, 2025
Merged

Sonos fix media player join to avoid race condition #159106

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 14 additions & 4 deletions homeassistant/components/sonos/speaker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,11 +1014,21 @@ async def join_multi(
speakers: list[SonosSpeaker],
) -> None:
"""Form a group with other players."""
# When joining multiple speakers, build the group incrementally and
# wait for the grouping to complete after each join. This avoids race
# conditions in zone topology updates.
async with config_entry.runtime_data.topology_condition:
group: list[SonosSpeaker] = await hass.async_add_executor_job(
master.join, speakers
)
await SonosSpeaker.wait_for_groups(hass, config_entry, [group])
join_list: list[SonosSpeaker] = []
for speaker in speakers:
_LOGGER.debug("Join %s to %s", speaker.zone_name, master.zone_name)
join_list.append(speaker)
group: list[SonosSpeaker] = await hass.async_add_executor_job(
master.join, join_list
)
await SonosSpeaker.wait_for_groups(hass, config_entry, [group])
_LOGGER.debug(
"Join Complete %s to %s", speaker.zone_name, master.zone_name
)

@soco_error()
def unjoin(self) -> None:
Expand Down
Loading