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

Ensure router executor acquires proper shard lock 

Though Citus' Task struct has a shardId field, it doesn't have the same
semantics as the one previously used in pg_shard code. The analogous
field in the Citus Task is anchorShardId. I've also added an argument
check to the relevant locking function to catch future locking attempts
which pass an invalid argument.
pull/344/head
Jason Petersen 2016-02-16 11:20:18 -07:00
parent 334f800016
commit 0d196d1bf4
No known key found for this signature in database
GPG Key ID: 9F1D3510D110ABA9
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/distributed/executor/multi_router_executor.c
View File

@ -153,7 +153,7 @@ CommutativityRuleToLockMode(CmdType commandType, bool upsertQuery)
static void static void
AcquireExecutorShardLock(Task *task, LOCKMODE lockMode) AcquireExecutorShardLock(Task *task, LOCKMODE lockMode)
{ {
int64 shardId = task->shardId; int64 shardId = task->anchorShardId;
LockShardResource(shardId, lockMode); LockShardResource(shardId, lockMode);
} }

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

@ -14,9 +14,10 @@
*/ */
#include "postgres.h" #include "postgres.h"
#include "c.h"
#include "miscadmin.h" #include "miscadmin.h"
#include "distributed/relay_utility.h"
#include "distributed/resource_lock.h" #include "distributed/resource_lock.h"
#include "storage/lmgr.h" #include "storage/lmgr.h"
@ -68,6 +69,8 @@ LockShardResource(uint64 shardId, LOCKMODE lockmode)
const bool sessionLock = false; const bool sessionLock = false;
const bool dontWait = false; const bool dontWait = false;
AssertArg(shardId != INVALID_SHARD_ID);
SET_LOCKTAG_SHARD_RESOURCE(tag, MyDatabaseId, shardId); SET_LOCKTAG_SHARD_RESOURCE(tag, MyDatabaseId, shardId);
(void) LockAcquire(&tag, lockmode, sessionLock, dontWait); (void) LockAcquire(&tag, lockmode, sessionLock, dontWait);