external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change the order in which the locks are acquired.

rebalance_move_notice
eaydingol 2024-02-27 09:32:57 +00:00
parent aeded49fc8
commit 1b8ed32189
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/backend/distributed/utils/resource_lock.c
View File

@ -707,13 +707,10 @@ SerializeNonCommutativeWrites(List *shardIntervalList, LOCKMODE lockMode)
} }
List *replicatedShardList = NIL; List *replicatedShardList = NIL;
if (AnyTableReplicated(shardIntervalList, &replicatedShardList)) bool anyTableReplicated = AnyTableReplicated(shardIntervalList, &replicatedShardList);
{
if (ClusterHasKnownMetadataWorkers() && !IsFirstWorkerNode())
{
LockShardListResourcesOnFirstWorker(lockMode, replicatedShardList);
}
if (anyTableReplicated)
{
ShardInterval *firstShardInterval = ShardInterval *firstShardInterval =
(ShardInterval *) linitial(replicatedShardList); (ShardInterval *) linitial(replicatedShardList);
if (ReferenceTableShardId(firstShardInterval->shardId)) if (ReferenceTableShardId(firstShardInterval->shardId))
@ -728,7 +725,10 @@ SerializeNonCommutativeWrites(List *shardIntervalList, LOCKMODE lockMode)
LockReferencedReferenceShardResources(firstShardInterval->shardId, lockMode); LockReferencedReferenceShardResources(firstShardInterval->shardId, lockMode);
} }
} }
if (anyTableReplicated && ClusterHasKnownMetadataWorkers() && !IsFirstWorkerNode())
{
LockShardListResourcesOnFirstWorker(lockMode, replicatedShardList);
}
LockShardListResources(shardIntervalList, lockMode); LockShardListResources(shardIntervalList, lockMode);
} }

18
src/test/regress/expected/issue_7477.out
View File

@ -45,16 +45,16 @@ SELECT * FROM master_run_on_worker(
true); true);
node_name | node_port | success | result node_name | node_port | success | result
--------------------------------------------------------------------- ---------------------------------------------------------------------
localhost | 57638 | f | ERROR: deadlock detected 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 localhost | 57637 | t | UPDATE 1
localhost | 57637 | f | ERROR: deadlock detected
localhost | 57638 | f | ERROR: deadlock detected
localhost | 57637 | f | ERROR: canceling the transaction since it was involved in a distributed deadlock
localhost | 57638 | f | ERROR: deadlock detected
localhost | 57637 | f | ERROR: deadlock detected
localhost | 57638 | f | ERROR: deadlock detected
localhost | 57638 | f | ERROR: canceling the transaction since it was involved in a distributed deadlock
localhost | 57637 | f | ERROR: deadlock detected
(10 rows) (10 rows)
--- cleanup --- cleanup