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

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
384ccf2
Faster joins: don't stale when an user joins during a fast join
Dec 2, 2022
615d303
Merge branch 'develop' into mv/join-during-fast-join
Dec 29, 2022
7c1e8cf
Only delete fw extrems on join if room state is not partial
MatMaul Dec 29, 2022
0c3bc68
Only call _clean_room_for_join if send_join was successful
MatMaul Dec 29, 2022
4f6c342
move already_partially_joined closer to its use to avoid races
MatMaul Dec 29, 2022
6aa72e1
Fallback to local join if a room is unpartial stated during remote join
Jan 2, 2023
d98994c
Move PartialStateConflictError to api.errors because of circular dep
Jan 2, 2023
02d285e
Merge branch 'develop' into mv/join-during-fast-join
Jan 2, 2023
9919405
Merge branch 'develop' into mv/join-during-fast-join
Jan 9, 2023
a24d07a
Small mistake
Jan 9, 2023
20d5d34
Merge branch 'develop' into mv/join-during-fast-join
Jan 27, 2023
9a934c1
fix up for #14882
Jan 27, 2023
5826574
fixup imports
Jan 27, 2023
1df7060
fixup exception docstring
Jan 27, 2023
bfba7bb
fixup: remove more defunct PartialStateConflictError handling
Jan 27, 2023
0ecd9ba
Avoid clobbering existing local memberships on a second partial join
Jan 31, 2023
a23a64f
fix trial tests
Jan 31, 2023
95a529c
fix typo in changelog
Feb 3, 2023
438d592
fixup docstring to explain what a None prev_membership means
Feb 4, 2023
cfb71f0
fixup: is_host_in_room was already accurate given partial state
Feb 4, 2023
4fcf84e
make partial statedness of state maps explicit
Feb 4, 2023
4da4eda
fix typos and line wrapping
Feb 4, 2023
e97b44d
fixup: comment wording
Feb 10, 2023
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
Prev Previous commit
Next Next commit
fix typo in changelog
  • Loading branch information
Sean Quah committed Feb 3, 2023
commit 95a529c56e42981cbfee5d9d2eaf570e211f6714
2 changes: 1 addition & 1 deletion changelog.d/14606.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Faster joins: don't stale when another user joins during a fast join resync.
Faster joins: don't stall when another user joins during a fast join resync.