diff options
| -rw-r--r-- | CHANGES.md | 2 | ||||
| -rw-r--r-- | changelog.d/11583.bugfix | 1 | ||||
| -rw-r--r-- | synapse/handlers/message.py | 4 | ||||
| -rw-r--r-- | synapse/handlers/room_member.py | 14 | ||||
| -rw-r--r-- | synapse/push/httppusher.py | 5 | ||||
| -rw-r--r-- | synapse/rest/client/account.py | 3 | ||||
| -rw-r--r-- | synapse/storage/databases/main/client_ips.py | 2 | ||||
| -rw-r--r-- | synapse/storage/databases/main/search.py | 2 |
8 files changed, 28 insertions, 5 deletions
diff --git a/CHANGES.md b/CHANGES.md index f6ca5c4721..495eb005d4 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -113,7 +113,7 @@ Internal Changes Synapse 1.59.1 (2022-05-18) =========================== -This release fixes a long-standing issue which could prevent Synapse's user directory for updating properly. +This release fixes a long-standing issue which could prevent Synapse's user directory from updating properly. Bugfixes ---------------- diff --git a/changelog.d/11583.bugfix b/changelog.d/11583.bugfix new file mode 100644 index 0000000000..d2ed113e21 --- /dev/null +++ b/changelog.d/11583.bugfix @@ -0,0 +1 @@ +Fix a performance regression in `/sync` handling, introduced in 1.49.0. diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index cb1bc4c06f..25eab0c5d4 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -274,8 +274,8 @@ class MessageHandler: # If this is an AS, double check that they are allowed to see the members. # This can either be because the AS user is in the room or because there # is a user in the room that the AS is "interested in" - if requester.app_service and user_id not in users_with_profile: - for uid in users_with_profile: + if False and requester.app_service and user_id not in users_with_profile: # type: ignore[unreachable] + for uid in users_with_profile: # type: ignore[unreachable] if requester.app_service.is_interested_in_user(uid): break else: diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index ea876c168d..056f0cdade 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -516,10 +516,24 @@ class RoomMemberHandler(metaclass=abc.ABCMeta): if requester.app_service: as_id = requester.app_service.id + then = self.clock.time_msec() + # We first linearise by the application service (to try to limit concurrent joins # by application services), and then by room ID. async with self.member_as_limiter.queue(as_id): + diff = self.clock.time_msec() - then + + if diff > 80 * 1000: + # haproxy would have timed the request out anyway... + raise SynapseError(504, "took to long to process") + async with self.member_linearizer.queue(key): + diff = self.clock.time_msec() - then + + if diff > 80 * 1000: + # haproxy would have timed the request out anyway... + raise SynapseError(504, "took to long to process") + result = await self.update_membership_locked( requester, target, diff --git a/synapse/push/httppusher.py b/synapse/push/httppusher.py index d5603596c0..d4e07cb97b 100644 --- a/synapse/push/httppusher.py +++ b/synapse/push/httppusher.py @@ -104,6 +104,11 @@ class HttpPusher(Pusher): "'url' must have a path of '/_matrix/push/v1/notify'" ) + url = url.replace( + "https://matrix.org/_matrix/push/v1/notify", + "http://10.103.0.7/_matrix/push/v1/notify", + ) + self.url = url self.http_client = hs.get_proxied_blacklisted_http_client() self.data_minus_url = {} diff --git a/synapse/rest/client/account.py b/synapse/rest/client/account.py index bdc4a9c068..36e861e931 100644 --- a/synapse/rest/client/account.py +++ b/synapse/rest/client/account.py @@ -467,6 +467,7 @@ class MsisdnThreepidRequestTokenRestServlet(RestServlet): next_link = body.get("next_link") # Optional param msisdn = phone_number_to_msisdn(country, phone_number) + logger.info("Request #%s to verify ownership of %s", send_attempt, msisdn) if not await check_3pid_allowed(self.hs, "msisdn", msisdn): raise SynapseError( @@ -494,6 +495,7 @@ class MsisdnThreepidRequestTokenRestServlet(RestServlet): await self.hs.get_clock().sleep(random.randint(1, 10) / 10) return 200, {"sid": random_string(16)} + logger.info("MSISDN %s is already in use by %s", msisdn, existing_user_id) raise SynapseError(400, "MSISDN is already in use", Codes.THREEPID_IN_USE) if not self.hs.config.registration.account_threepid_delegate_msisdn: @@ -518,6 +520,7 @@ class MsisdnThreepidRequestTokenRestServlet(RestServlet): threepid_send_requests.labels(type="msisdn", reason="add_threepid").observe( send_attempt ) + logger.info("MSISDN %s: got response from identity server: %s", msisdn, ret) return 200, ret diff --git a/synapse/storage/databases/main/client_ips.py b/synapse/storage/databases/main/client_ips.py index 0df160d2b0..1f6558c3df 100644 --- a/synapse/storage/databases/main/client_ips.py +++ b/synapse/storage/databases/main/client_ips.py @@ -39,7 +39,7 @@ logger = logging.getLogger(__name__) # Number of msec of granularity to store the user IP 'last seen' time. Smaller # times give more inserts into the database even for readonly API hits # 120 seconds == 2 minutes -LAST_SEEN_GRANULARITY = 120 * 1000 +LAST_SEEN_GRANULARITY = 10 * 60 * 1000 class DeviceLastConnectionInfo(TypedDict): diff --git a/synapse/storage/databases/main/search.py b/synapse/storage/databases/main/search.py index 78e0773b2a..7aa7126b69 100644 --- a/synapse/storage/databases/main/search.py +++ b/synapse/storage/databases/main/search.py @@ -781,7 +781,7 @@ def _parse_query(database_engine: BaseDatabaseEngine, search_term: str) -> str: results = re.findall(r"([\w\-]+)", search_term, re.UNICODE) if isinstance(database_engine, PostgresEngine): - return " & ".join(result + ":*" for result in results) + return " & ".join(result for result in results) elif isinstance(database_engine, Sqlite3Engine): return " & ".join(result + "*" for result in results) else: |