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
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix rare deadlock when using read/write locks (#16133)
- Loading branch information
1 parent
7cd79ce
commit 4adaba9
Showing
2 changed files
with
38 additions
and
0 deletions.
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 @@ | ||
Fix a rare race that could block new events from being sent for up to two minutes. Introduced in v1.90.0. |
37 changes: 37 additions & 0 deletions
37
synapse/storage/schema/main/delta/80/02_read_write_locks_deadlock.sql.postgres
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,37 @@ | ||
/* Copyright 2023 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. | ||
*/ | ||
|
||
-- To avoid the possibility of a deadlock, lock the | ||
-- `worker_read_write_locks_mode` table so that we serialize inserts/deletes | ||
-- for a specific lock name/key. | ||
|
||
CREATE OR REPLACE FUNCTION delete_read_write_lock_parent_before() RETURNS trigger AS $$ | ||
BEGIN | ||
-- `PERFORM` is a `SELECT` which discards the rows. | ||
PERFORM * FROM worker_read_write_locks_mode | ||
WHERE | ||
lock_name = OLD.lock_name | ||
AND lock_key = OLD.lock_key | ||
FOR UPDATE; | ||
|
||
RETURN OLD; | ||
END | ||
$$ | ||
LANGUAGE plpgsql; | ||
|
||
DROP TRIGGER IF EXISTS delete_read_write_lock_parent_before_trigger ON worker_read_write_locks; | ||
CREATE TRIGGER delete_read_write_lock_parent_before_trigger BEFORE DELETE ON worker_read_write_locks | ||
FOR EACH ROW | ||
EXECUTE PROCEDURE delete_read_write_lock_parent_before(); |