This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Add ability to shard the federation sender #7798
Merged
Merged
Changes from 9 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
3f7f3e8
Move some federation config to its own config module
erikjohnston f3af084
Add config for sharding federation sender
erikjohnston ce001b6
Handle multiple instance in fed stream pos table
erikjohnston 943aa9e
Handle federation acks from multiple places
erikjohnston 0c3ab93
Add tests.
erikjohnston 447c365
Newsfile
erikjohnston 04fb6f5
Fix test for :memory: database
erikjohnston 3985cd6
Fix setting config at wrong layer
erikjohnston ab6f133
Review comments
erikjohnston 6c5a9a8
Fix wrong boolean
erikjohnston 8f14f44
Remove dead code
erikjohnston 92997f8
Move _reset_federation_positions_txn out of start up
erikjohnston 341703d
isort
erikjohnston File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Add experimental support for running multiple federation sender processes. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,129 @@ | ||
# -*- coding: utf-8 -*- | ||
# Copyright 2020 The Matrix.org Foundation C.I.C. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
from hashlib import sha256 | ||
from typing import List, Optional | ||
|
||
import attr | ||
from netaddr import IPSet | ||
|
||
from ._base import Config, ConfigError | ||
|
||
|
||
@attr.s | ||
class ShardedFederationSendingConfig: | ||
"""Algorithm for choosing which federation sender instance is responsible | ||
for which destionation host. | ||
""" | ||
|
||
instances = attr.ib(type=List[str]) | ||
|
||
def should_send_to(self, instance_name: str, destination: str) -> bool: | ||
"""Whether this instance is responsible for sending transcations for | ||
the given host. | ||
""" | ||
|
||
# If multiple federation senders are not defined we always return true. | ||
if not self.instances or len(self.instances) == 1: | ||
return True | ||
|
||
# We shard by taking the hash, modulo it by the number of federation | ||
# senders and then checking whether this instance matches the instance | ||
# at that index. | ||
# | ||
# (Technically this introduces some bias and is not entirely uniform, but | ||
# since the hash is so large the bias is ridiculously small). | ||
dest_hash = sha256(destination.encode("utf8")).digest() | ||
dest_int = int.from_bytes(dest_hash, byteorder="little") | ||
remainder = dest_int % (len(self.instances)) | ||
return self.instances[remainder] == instance_name | ||
|
||
|
||
class FederationConfig(Config): | ||
section = "federation" | ||
|
||
def read_config(self, config, **kwargs): | ||
# Whether to send federation traffic out in this process. This only | ||
# applies to some federation traffic, and so shouldn't be used to | ||
# "disable" federation | ||
self.send_federation = config.get("send_federation", True) | ||
|
||
federation_sender_instances = config.get("federation_sender_instances") or [] | ||
self.federation_shard_config = ShardedFederationSendingConfig( | ||
federation_sender_instances | ||
) | ||
|
||
# FIXME: federation_domain_whitelist needs sytests | ||
self.federation_domain_whitelist = None # type: Optional[dict] | ||
federation_domain_whitelist = config.get("federation_domain_whitelist", None) | ||
|
||
if federation_domain_whitelist is not None: | ||
# turn the whitelist into a hash for speed of lookup | ||
self.federation_domain_whitelist = {} | ||
|
||
for domain in federation_domain_whitelist: | ||
self.federation_domain_whitelist[domain] = True | ||
Comment on lines
+76
to
+77
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Not really related to this PR, but we should probably normalize these domains. Also, can't this be a There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'd rather not try and deal with that here. |
||
|
||
self.federation_ip_range_blacklist = config.get( | ||
"federation_ip_range_blacklist", [] | ||
) | ||
|
||
# Attempt to create an IPSet from the given ranges | ||
try: | ||
self.federation_ip_range_blacklist = IPSet( | ||
self.federation_ip_range_blacklist | ||
) | ||
|
||
# Always blacklist 0.0.0.0, :: | ||
self.federation_ip_range_blacklist.update(["0.0.0.0", "::"]) | ||
except Exception as e: | ||
raise ConfigError( | ||
"Invalid range(s) provided in federation_ip_range_blacklist: %s" % e | ||
) | ||
|
||
def generate_config_section(self, config_dir_path, server_name, **kwargs): | ||
return """\ | ||
# Restrict federation to the following whitelist of domains. | ||
# N.B. we recommend also firewalling your federation listener to limit | ||
# inbound federation traffic as early as possible, rather than relying | ||
# purely on this application-layer restriction. If not specified, the | ||
# default is to whitelist everything. | ||
# | ||
#federation_domain_whitelist: | ||
# - lon.example.com | ||
# - nyc.example.com | ||
# - syd.example.com | ||
|
||
# Prevent federation requests from being sent to the following | ||
# blacklist IP address CIDR ranges. If this option is not specified, or | ||
# specified with an empty list, no ip range blacklist will be enforced. | ||
# | ||
# As of Synapse v1.4.0 this option also affects any outbound requests to identity | ||
# servers provided by user input. | ||
# | ||
# (0.0.0.0 and :: are always blacklisted, whether or not they are explicitly | ||
# listed here, since they correspond to unroutable addresses.) | ||
# | ||
federation_ip_range_blacklist: | ||
- '127.0.0.0/8' | ||
- '10.0.0.0/8' | ||
- '172.16.0.0/12' | ||
- '192.168.0.0/16' | ||
- '100.64.0.0/10' | ||
- '169.254.0.0/16' | ||
- '::1/128' | ||
- 'fe80::/64' | ||
- 'fc00::/7' | ||
""" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think this can change after creation, so should we do this in
FederationConfig()
and have aMonolithFederationSendingConfig
which always returnsTrue
froshould_send_to
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I thought about this and I think its more lines of code for not a lot. Sending federation requests is sufficiently expensive that I don't think avoiding two boolean checks really makes a difference