-
Notifications
You must be signed in to change notification settings - Fork 653
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Change the order in which the locks are acquired (#7542)
This PR changes the order in which the locks are acquired (for the target and reference tables), when a modify request is initiated from a worker node that is not the "FirstWorkerNode". To prevent concurrent writes, locks are acquired on the first worker node for the replicated tables. When the update statement originates from the first worker node, it acquires the lock on the reference table(s) first, followed by the target table(s). However, if the update statement is initiated in another worker node, the lock requests are sent to the first worker in a different order. This PR unifies the modification order on the first worker node. With the third commit, independent of the node that received the request, the locks are acquired for the modified table and then the reference tables on the first node. The first commit shows a sample output for the test prior to the fix. Fixes #7477 --------- Co-authored-by: Jelte Fennema-Nio <jelte.fennema@microsoft.com> (cherry picked from commit 8afa2d0)
- Loading branch information
Showing
4 changed files
with
126 additions
and
8 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
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,62 @@ | ||
--- Test for updating a table that has a foreign key reference to another reference table. | ||
--- Issue #7477: Distributed deadlock after issuing a simple UPDATE statement | ||
--- https://github.com/citusdata/citus/issues/7477 | ||
CREATE TABLE table1 (id INT PRIMARY KEY); | ||
SELECT create_reference_table('table1'); | ||
create_reference_table | ||
--------------------------------------------------------------------- | ||
|
||
(1 row) | ||
|
||
INSERT INTO table1 VALUES (1); | ||
CREATE TABLE table2 ( | ||
id INT, | ||
info TEXT, | ||
CONSTRAINT table1_id_fk FOREIGN KEY (id) REFERENCES table1 (id) | ||
); | ||
SELECT create_reference_table('table2'); | ||
create_reference_table | ||
--------------------------------------------------------------------- | ||
|
||
(1 row) | ||
|
||
INSERT INTO table2 VALUES (1, 'test'); | ||
--- Runs the update command in parallel on workers. | ||
--- Due to bug #7477, before the fix, the result is non-deterministic | ||
--- and have several rows of the form: | ||
--- localhost | 57638 | f | ERROR: deadlock detected | ||
--- localhost | 57637 | f | ERROR: deadlock detected | ||
--- localhost | 57637 | f | ERROR: canceling the transaction since it was involved in a distributed deadlock | ||
SELECT * FROM master_run_on_worker( | ||
ARRAY['localhost', 'localhost','localhost', 'localhost','localhost', | ||
'localhost','localhost', 'localhost','localhost', 'localhost']::text[], | ||
ARRAY[57638, 57637, 57637, 57638, 57637, 57638, 57637, 57638, 57638, 57637]::int[], | ||
ARRAY['UPDATE table2 SET info = ''test_update'' WHERE id = 1', | ||
'UPDATE table2 SET info = ''test_update'' WHERE id = 1', | ||
'UPDATE table2 SET info = ''test_update'' WHERE id = 1', | ||
'UPDATE table2 SET info = ''test_update'' WHERE id = 1', | ||
'UPDATE table2 SET info = ''test_update'' WHERE id = 1', | ||
'UPDATE table2 SET info = ''test_update'' WHERE id = 1', | ||
'UPDATE table2 SET info = ''test_update'' WHERE id = 1', | ||
'UPDATE table2 SET info = ''test_update'' WHERE id = 1', | ||
'UPDATE table2 SET info = ''test_update'' WHERE id = 1', | ||
'UPDATE table2 SET info = ''test_update'' WHERE id = 1' | ||
]::text[], | ||
true); | ||
node_name | node_port | success | result | ||
--------------------------------------------------------------------- | ||
localhost | 57638 | t | UPDATE 1 | ||
localhost | 57637 | t | UPDATE 1 | ||
localhost | 57637 | t | UPDATE 1 | ||
localhost | 57638 | t | UPDATE 1 | ||
localhost | 57637 | t | UPDATE 1 | ||
localhost | 57638 | t | UPDATE 1 | ||
localhost | 57637 | t | UPDATE 1 | ||
localhost | 57638 | t | UPDATE 1 | ||
localhost | 57638 | t | UPDATE 1 | ||
localhost | 57637 | t | UPDATE 1 | ||
(10 rows) | ||
|
||
--- cleanup | ||
DROP TABLE table2; | ||
DROP TABLE table1; |
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,44 @@ | ||
|
||
--- Test for updating a table that has a foreign key reference to another reference table. | ||
--- Issue #7477: Distributed deadlock after issuing a simple UPDATE statement | ||
--- https://github.com/citusdata/citus/issues/7477 | ||
|
||
CREATE TABLE table1 (id INT PRIMARY KEY); | ||
SELECT create_reference_table('table1'); | ||
INSERT INTO table1 VALUES (1); | ||
|
||
CREATE TABLE table2 ( | ||
id INT, | ||
info TEXT, | ||
CONSTRAINT table1_id_fk FOREIGN KEY (id) REFERENCES table1 (id) | ||
); | ||
SELECT create_reference_table('table2'); | ||
INSERT INTO table2 VALUES (1, 'test'); | ||
|
||
--- Runs the update command in parallel on workers. | ||
--- Due to bug #7477, before the fix, the result is non-deterministic | ||
--- and have several rows of the form: | ||
--- localhost | 57638 | f | ERROR: deadlock detected | ||
--- localhost | 57637 | f | ERROR: deadlock detected | ||
--- localhost | 57637 | f | ERROR: canceling the transaction since it was involved in a distributed deadlock | ||
|
||
SELECT * FROM master_run_on_worker( | ||
ARRAY['localhost', 'localhost','localhost', 'localhost','localhost', | ||
'localhost','localhost', 'localhost','localhost', 'localhost']::text[], | ||
ARRAY[57638, 57637, 57637, 57638, 57637, 57638, 57637, 57638, 57638, 57637]::int[], | ||
ARRAY['UPDATE table2 SET info = ''test_update'' WHERE id = 1', | ||
'UPDATE table2 SET info = ''test_update'' WHERE id = 1', | ||
'UPDATE table2 SET info = ''test_update'' WHERE id = 1', | ||
'UPDATE table2 SET info = ''test_update'' WHERE id = 1', | ||
'UPDATE table2 SET info = ''test_update'' WHERE id = 1', | ||
'UPDATE table2 SET info = ''test_update'' WHERE id = 1', | ||
'UPDATE table2 SET info = ''test_update'' WHERE id = 1', | ||
'UPDATE table2 SET info = ''test_update'' WHERE id = 1', | ||
'UPDATE table2 SET info = ''test_update'' WHERE id = 1', | ||
'UPDATE table2 SET info = ''test_update'' WHERE id = 1' | ||
]::text[], | ||
true); | ||
|
||
--- cleanup | ||
DROP TABLE table2; | ||
DROP TABLE table1; |