Skip to content

Sonos fix media player join to avoid race condition#159106

Merged
joostlek merged 1 commit into
home-assistant:devfrom
PeteRager:sonos-join-he
Dec 15, 2025
Merged

Sonos fix media player join to avoid race condition#159106
joostlek merged 1 commit into
home-assistant:devfrom
PeteRager:sonos-join-he

Conversation

@PeteRager
Copy link
Copy Markdown
Contributor

Proposed change

When joining speakers using media_player.join the integration sends the join command to each speaker and waits with a timeout for the speakers to reach the desired group state. Each individual speakers responds with one or more zone group state (ZGS) messages. When there are a large number of speakers (like 7); sometimes the ZGS messages from the speakers arrive in incorrect order and the final state (all speakers are grouped) gets overwritten with an intermediate state (some speakers are grouped) and then the wait times out.

This situation likely always existed. With the change in #145602 replacing the warning messages with a HomeAssistantError the situation is now being noticed by users.

The change is to make the joining process deterministic by joining one speaker at a time; and waiting for the speaker to be joined before proceeding to the next one.

Type of change

  • Dependency upgrade
  • Bugfix (non-breaking change which fixes an issue)
  • New integration (thank you!)
  • New feature (which adds functionality to an existing integration)
  • Deprecation (breaking change to happen in the future)
  • Breaking change (fix/feature causing existing functionality to break)
  • Code quality improvements to existing code or addition of tests

Additional information

Checklist

  • I understand the code I am submitting and can explain how it works.
  • The code change is tested and works locally.
  • Local tests pass. Your PR cannot be merged unless tests pass
  • There is no commented out code in this PR.
  • I have followed the development checklist
  • I have followed the perfect PR recommendations
  • The code has been formatted using Ruff (ruff format homeassistant tests)
  • Tests have been added to verify that the new code works.
  • Any generated code has been carefully reviewed for correctness and compliance with project standards.

If user exposed functionality or configuration variables are added/changed:

If the code communicates with devices, web services, or third-party tools:

  • The manifest file has all fields filled out correctly.
    Updated and included derived files by running: python3 -m script.hassfest.
  • New or updated dependencies have been added to requirements_all.txt.
    Updated by running python3 -m script.gen_requirements_all.
  • For the updated dependencies - a link to the changelog, or at minimum a diff between library versions is added to the PR description.

To help with the load of incoming pull requests:

@home-assistant
Copy link
Copy Markdown
Contributor

Hey there @jjlawren, mind taking a look at this pull request as it has been labeled with an integration (sonos) you are listed as a code owner for? Thanks!

Code owner commands

Code owners of sonos can trigger bot actions by commenting:

  • @home-assistant close Closes the pull request.
  • @home-assistant rename Awesome new title Renames the pull request.
  • @home-assistant reopen Reopen the pull request.
  • @home-assistant unassign sonos Removes the current integration label and assignees on the pull request, add the integration domain after the command.
  • @home-assistant add-label needs-more-information Add a label (needs-more-information, problem in dependency, problem in custom component) to the pull request.
  • @home-assistant remove-label needs-more-information Remove a label (needs-more-information, problem in dependency, problem in custom component) on the pull request.

@joostlek joostlek merged commit c69ef7e into home-assistant:dev Dec 15, 2025
36 checks passed
@joostlek joostlek added this to the 2025.12.4 milestone Dec 15, 2025
@github-actions github-actions Bot locked and limited conversation to collaborators Dec 16, 2025
@PeteRager PeteRager deleted the sonos-join-he branch December 23, 2025 21:40
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants