Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Faster joins: don't stall when a user joins during a fast join #14606

Merged
merged 23 commits into from
Feb 10, 2023
Merged

Faster joins: don't stall when a user joins during a fast join #14606

merged 23 commits into from
Feb 10, 2023

Commits on Dec 19, 2022

  1. Faster joins: don't stale when an user joins during a fast join 

    Signed-off-by: Mathieu Velten <[email protected]>
    Mathieu Velten committed Dec 19, 2022
    Configuration menu
    Copy the full SHA
    384ccf2 View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2022

  1. Merge branch 'develop' into mv/join-during-fast-join

    Mathieu Velten authored Dec 29, 2022
    Configuration menu
    Copy the full SHA
    615d303 View commit details
    Browse the repository at this point in the history

  2. Only delete fw extrems on join if room state is not partial

    @MatMaul
    MatMaul committed Dec 29, 2022
    Configuration menu
    Copy the full SHA
    7c1e8cf View commit details
    Browse the repository at this point in the history

  3. Only call _clean_room_for_join if send_join was successful

    @MatMaul
    MatMaul committed Dec 29, 2022
    Configuration menu
    Copy the full SHA
    0c3bc68 View commit details
    Browse the repository at this point in the history

  4. move already_partially_joined closer to its use to avoid races

    @MatMaul
    MatMaul committed Dec 29, 2022
    Configuration menu
    Copy the full SHA
    4f6c342 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2023

  1. Fallback to local join if a room is unpartial stated during remote join

    Mathieu Velten committed Jan 2, 2023
    Configuration menu
    Copy the full SHA
    6aa72e1 View commit details
    Browse the repository at this point in the history

  2. Move PartialStateConflictError to api.errors because of circular dep

    Mathieu Velten committed Jan 2, 2023
    Configuration menu
    Copy the full SHA
    d98994c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into mv/join-during-fast-join

    Mathieu Velten authored Jan 2, 2023
    Configuration menu
    Copy the full SHA
    02d285e View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2023

  1. Merge branch 'develop' into mv/join-during-fast-join

    Mathieu Velten authored Jan 9, 2023
    Configuration menu
    Copy the full SHA
    9919405 View commit details
    Browse the repository at this point in the history

  2. Small mistake

    Mathieu Velten committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    a24d07a View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2023

  1. Merge branch 'develop' into mv/join-during-fast-join

    Sean Quah committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    20d5d34 View commit details
    Browse the repository at this point in the history

  2. fix up for #14882 

    * the filter for partial state rooms in `_clean_room_for_join_txn` has
  been replaced with a host membership check in `_do_invite_join`.
* `_do_invite_join` can no longer raise a `PartialStateConflictError`.
    Sean Quah committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    9a934c1 View commit details
    Browse the repository at this point in the history

  3. fixup imports

    Sean Quah committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    5826574 View commit details
    Browse the repository at this point in the history

  4. fixup exception docstring

    Sean Quah committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    1df7060 View commit details
    Browse the repository at this point in the history

  5. fixup: remove more defunct PartialStateConflictError handling

    Sean Quah committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    bfba7bb View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2023

  1. Avoid clobbering existing local memberships on a second partial join 

    Signed-off-by: Sean Quah <[email protected]>
    Sean Quah committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    0ecd9ba View commit details
    Browse the repository at this point in the history

  2. fix trial tests

    Sean Quah committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    a23a64f View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2023

  1. fix typo in changelog

    Sean Quah committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    95a529c View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2023

  1. fixup docstring to explain what a None prev_membership means

    Sean Quah committed Feb 4, 2023
    Configuration menu
    Copy the full SHA
    438d592 View commit details
    Browse the repository at this point in the history

  2. fixup: is_host_in_room was already accurate given partial state

    Sean Quah committed Feb 4, 2023
    Configuration menu
    Copy the full SHA
    cfb71f0 View commit details
    Browse the repository at this point in the history

  3. make partial statedness of state maps explicit

    Sean Quah committed Feb 4, 2023
    Configuration menu
    Copy the full SHA
    4fcf84e View commit details
    Browse the repository at this point in the history

  4. fix typos and line wrapping

    Sean Quah committed Feb 4, 2023
    Configuration menu
    Copy the full SHA
    4da4eda View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2023

  1. fixup: comment wording

    Sean Quah committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    e97b44d View commit details
    Browse the repository at this point in the history