This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
Fix rare deadlock when using read/write locks #16169
Merged
Merged
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
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 @@ | ||
Fix a rare race that could block new events from being sent for up to two minutes. Introduced in v1.90.0. |
37 changes: 0 additions & 37 deletions
37
synapse/storage/schema/main/delta/80/02_read_write_locks_deadlock.sql.postgres
This file was deleted.
Oops, something went wrong.
67 changes: 67 additions & 0 deletions
67
synapse/storage/schema/main/delta/80/04_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,67 @@ | ||
/* 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. | ||
*/ | ||
|
||
|
||
-- Remove a previous attempt to avoid deadlocks | ||
DROP TRIGGER IF EXISTS delete_read_write_lock_parent_before_trigger ON worker_read_write_locks; | ||
DROP FUNCTION IF EXISTS delete_read_write_lock_parent_before; | ||
|
||
|
||
-- Ensure that we keep `worker_read_write_locks_mode` up to date whenever a lock | ||
-- is released (i.e. a row deleted from `worker_read_write_locks`). Either we | ||
-- update the `worker_read_write_locks_mode.token` to match another instance | ||
-- that has currently acquired the lock, or we delete the row if nobody has | ||
-- currently acquired a lock. | ||
CREATE OR REPLACE FUNCTION delete_read_write_lock_parent() RETURNS trigger AS $$ | ||
DECLARE | ||
new_token TEXT; | ||
BEGIN | ||
-- Only update the token in `_mode` if its our token. This prevents | ||
-- deadlocks. | ||
PERFORM * FROM worker_read_write_locks_mode | ||
WHERE | ||
lock_name = OLD.lock_name | ||
AND lock_key = OLD.lock_key | ||
AND token = OLD.token | ||
FOR UPDATE; | ||
|
||
IF NOT FOUND THEN | ||
RETURN NEW; | ||
END IF; | ||
|
||
SELECT token INTO new_token FROM worker_read_write_locks | ||
WHERE | ||
lock_name = OLD.lock_name | ||
AND lock_key = OLD.lock_key | ||
LIMIT 1 FOR UPDATE SKIP LOCKED; | ||
|
||
IF NOT FOUND THEN | ||
DELETE FROM worker_read_write_locks_mode | ||
WHERE lock_name = OLD.lock_name AND lock_key = OLD.lock_key AND token = OLD.token; | ||
ELSE | ||
UPDATE worker_read_write_locks_mode | ||
SET token = new_token | ||
WHERE lock_name = OLD.lock_name AND lock_key = OLD.lock_key; | ||
END IF; | ||
|
||
RETURN NEW; | ||
END | ||
$$ | ||
LANGUAGE plpgsql; | ||
|
||
DROP TRIGGER IF EXISTS delete_read_write_lock_parent_trigger ON worker_read_write_locks; | ||
CREATE TRIGGER delete_read_write_lock_parent_trigger AFTER DELETE ON worker_read_write_locks | ||
FOR EACH ROW | ||
EXECUTE PROCEDURE delete_read_write_lock_parent(); |
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.
ooi: does still still work as expected with
PERFORM
?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.
You make a good point there. I'll shove the returned row into a variable, as I can't see any obvious documentation