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

When restarting a partial join resync, prioritise the server which actioned a partial join #14126

Merged
merged 17 commits into from
Oct 18, 2022
Merged

When restarting a partial join resync, prioritise the server which actioned a partial join #14126

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
d05d53d
Partial state resync: catch NotRetryingDestination
Oct 10, 2022
507bea0
Add column to track where we partial-joined via
Oct 10, 2022
8f17eaa
Write new column
Oct 10, 2022
328b991
Read new column
Oct 10, 2022
91ef868
Note TODO in passing
Oct 10, 2022
dc0c68f
Factor out prioritisation logic
Oct 10, 2022
f1c3aca
Deal with a mypy complaint
Oct 10, 2022
6fe9fa1
Use new column
Oct 10, 2022
b9a77e8
Changelog
Oct 10, 2022
29b362d
Revert "Partial state resync: catch NotRetryingDestination"
Oct 13, 2022
468c5c2
Remove accidentally copy-pasted SQL comment
Oct 13, 2022
9c5a7e1
Move the destination arg checks into helper func
Oct 17, 2022
062fe4a
Remove TODO comment: we are implementing this
Oct 17, 2022
9e9be2b
Ignore inconsistent rows from `partial_state_rooms_servers`
Oct 17, 2022
1c9988e
Invert logic
Oct 17, 2022
1ccf9b8
Sod it, don't try to be clever with annotations
Oct 17, 2022
32444f1
Merge branch 'develop' into dmr/faster-joins/pick-resync-server
Oct 17, 2022
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
5 changes: 3 additions & 2 deletions synapse/handlers/federation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1617,7 +1617,7 @@ async def _resume_sync_partial_state_room(self) -> None:
async def _sync_partial_state_room(
self,
initial_destination: Optional[str],
other_destinations: Collection[str],
other_destinations: Sequence[str],
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you explain why this is needed? _prioritise_destinations_for_partial_state_resync takes a Collection, not a Sequence.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this might have been a left-over from a WIP version before I pulled out the helper. (Or maybe I was trying to express "we preserve the iteration order of other_destinations"? 🤷 )

Copy link
Contributor Author

@DMRobertson DMRobertson Oct 17, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See 1ccf9b8, in any case

room_id: str,
) -> None:
"""Background process to resync the state of a partial-state room
Expand Down Expand Up @@ -1738,6 +1738,7 @@ async def _sync_partial_state_room(
destination,
)


def _prioritise_destinations_for_partial_state_resync(
initial_destination: Optional[str], other_destinations: Collection[str]
) -> Sequence[str]:
Expand All @@ -1753,5 +1754,5 @@ def _prioritise_destinations_for_partial_state_resync(
destinations.remove(initial_destination)
destinations = [initial_destination] + destinations
else:
destinations = other_destinations
destinations = list(other_destinations)
return destinations