OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/release-v1.77' into matrix-org-hotfixes

anoa/redirect_instances
Erik Johnston 2023-02-09 15:30:19 +00:00
parent 3be2fc192d cd2484dc2e
commit 19bb342763
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/15024.bugfix Normal file
View File

@ -0,0 +1 @@
Fix bug where retried replication requests would return a failure. Introduced in v1.76.0.

1
changelog.d/15036.misc Normal file
View File

@ -0,0 +1 @@
Prepare for future database schema changes.

2
synapse/replication/http/_base.py
View File

@ -426,6 +426,8 @@ class ReplicationEndpoint(metaclass=abc.ABCMeta):
code, response = await self.response_cache.wrap( code, response = await self.response_cache.wrap(
txn_id, self._handle_request, request, content, **kwargs txn_id, self._handle_request, request, content, **kwargs
) )
# Take a copy so we don't mutate things in the cache.
response = dict(response)
else: else:
# The `@cancellable` decorator may be applied to `_handle_request`. But we # The `@cancellable` decorator may be applied to `_handle_request`. But we
# told `HttpServer.register_paths` that our handler is `_check_auth_and_handle`, # told `HttpServer.register_paths` that our handler is `_check_auth_and_handle`,

9
synapse/storage/schema/__init__.py
View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
SCHEMA_VERSION = 73 # remember to update the list below when updating SCHEMA_VERSION = 74 # remember to update the list below when updating
"""Represents the expectations made by the codebase about the database schema """Represents the expectations made by the codebase about the database schema
This should be incremented whenever the codebase changes its requirements on the This should be incremented whenever the codebase changes its requirements on the
@ -78,7 +78,7 @@ Changes in SCHEMA_VERSION = 72:
- Unused column application_services_state.last_txn is dropped - Unused column application_services_state.last_txn is dropped
- Cache invalidation stream id sequence now begins at 2 to match code expectation. - Cache invalidation stream id sequence now begins at 2 to match code expectation.
Changes in SCHEMA_VERSION = 73; Changes in SCHEMA_VERSION = 73:
- thread_id column is added to event_push_actions, event_push_actions_staging - thread_id column is added to event_push_actions, event_push_actions_staging
event_push_summary, receipts_linearized, and receipts_graph. event_push_summary, receipts_linearized, and receipts_graph.
- Add table `event_failed_pull_attempts` to keep track when we fail to pull - Add table `event_failed_pull_attempts` to keep track when we fail to pull
@ -86,6 +86,11 @@ Changes in SCHEMA_VERSION = 73;
- Add indexes to various tables (`event_failed_pull_attempts`, `insertion_events`, - Add indexes to various tables (`event_failed_pull_attempts`, `insertion_events`,
`batch_events`) to make it easy to delete all associated rows when purging a room. `batch_events`) to make it easy to delete all associated rows when purging a room.
- `inserted_ts` column is added to `event_push_actions_staging` table. - `inserted_ts` column is added to `event_push_actions_staging` table.
Changes in SCHEMA_VERSION = 74:
- A query on `event_stream_ordering` column has now been disambiguated (i.e. the
codebase can handle the `current_state_events`, `local_current_memberships` and
`room_memberships` tables having an `event_stream_ordering` column).
""" """