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

Merge pull request #1777 from citusdata/skip_page_locks 

Skip page-level locks for distributed deadlock detection
pull/1774/head^2
Önder Kalacı 2017-11-09 13:01:21 +03:00 committed by GitHub
parent a85a973c3e 94921a2be1
commit 14ff31704c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/backend/distributed/transaction/lock_graph.c
View File

@ -49,7 +49,7 @@ static bool ParseBoolField(PGresult *result, int rowIndex, int colIndex);
static TimestampTz ParseTimestampTzField(PGresult *result, int rowIndex, int colIndex); static TimestampTz ParseTimestampTzField(PGresult *result, int rowIndex, int colIndex);
static void ReturnWaitGraph(WaitGraph *waitGraph, FunctionCallInfo fcinfo); static void ReturnWaitGraph(WaitGraph *waitGraph, FunctionCallInfo fcinfo);
static WaitGraph * BuildLocalWaitGraph(void); static WaitGraph * BuildLocalWaitGraph(void);
static bool IsProcessWaitingForRelationExtension(PGPROC *proc); static bool IsProcessWaitingForSafeOperations(PGPROC *proc);
static void LockLockData(void); static void LockLockData(void);
static void UnlockLockData(void); static void UnlockLockData(void);
static void AddEdgesForLockWaits(WaitGraph *waitGraph, PGPROC *waitingProc, static void AddEdgesForLockWaits(WaitGraph *waitGraph, PGPROC *waitingProc,
@ -449,7 +449,7 @@ BuildLocalWaitGraph(void)
} }
/* skip if the process is blocked for relation extension */ /* skip if the process is blocked for relation extension */
if (IsProcessWaitingForRelationExtension(currentProc)) if (IsProcessWaitingForSafeOperations(currentProc))
{ {
continue; continue;
} }
@ -468,7 +468,7 @@ BuildLocalWaitGraph(void)
} }
/* skip if the process is blocked for relation extension */ /* skip if the process is blocked for relation extension */
if (IsProcessWaitingForRelationExtension(waitingProc)) if (IsProcessWaitingForSafeOperations(waitingProc))
{ {
continue; continue;
} }
@ -493,19 +493,19 @@ BuildLocalWaitGraph(void)
/* /*
* IsProcessWaitingForRelationExtension returns true if the given PROC * IsProcessWaitingForSafeOperations returns true if the given PROC
* waiting on relation extension lock. * waiting on relation extension lock or page locks.
* *
* In general for the purpose of distributed deadlock detection, we should * In general for the purpose of distributed deadlock detection, we should
* skip if the process blocked on the relation extension. Those locks are * skip if the process blocked on the locks that may not be part of deadlocks.
* held for a short duration while the relation is actually extended on * Those locks are held for a short duration while the relation or the index
* the disk and released as soon as the extension is done, even before the * is actually extended on the disk and released as soon as the extension is
* execution of the command that triggered the extension finishes. Thus, * done, even before the execution of the command that triggered the extension
* recording such waits on our lock graphs could yield detecting wrong * finishes. Thus, recording such waits on our lock graphs could yield detecting
* distributed deadlocks. * wrong distributed deadlocks.
*/ */
static bool static bool
IsProcessWaitingForRelationExtension(PGPROC *proc) IsProcessWaitingForSafeOperations(PGPROC *proc)
{ {
PROCLOCK *waitProcLock = NULL; PROCLOCK *waitProcLock = NULL;
LOCK *waitLock = NULL; LOCK *waitLock = NULL;
@ -518,7 +518,8 @@ IsProcessWaitingForRelationExtension(PGPROC *proc)
waitProcLock = proc->waitProcLock; waitProcLock = proc->waitProcLock;
waitLock = waitProcLock->tag.myLock; waitLock = waitProcLock->tag.myLock;
return waitLock->tag.locktag_type == LOCKTAG_RELATION_EXTEND; return waitLock->tag.locktag_type == LOCKTAG_RELATION_EXTEND ||
waitLock->tag.locktag_type == LOCKTAG_PAGE;
} }
@ -595,12 +596,12 @@ AddEdgesForLockWaits(WaitGraph *waitGraph, PGPROC *waitingProc, PROCStack *remai
/* /*
* Skip processes from the same lock group, processes that don't conflict, * Skip processes from the same lock group, processes that don't conflict,
* and processes that are waiting on a relation extension lock, which * and processes that are waiting on a relation extension lock or page locks,
* will be released shortly. * which will be released shortly.
*/ */
if (!IsSameLockGroup(waitingProc, currentProc) && if (!IsSameLockGroup(waitingProc, currentProc) &&
IsConflictingLockMask(procLock->holdMask, conflictMask) && IsConflictingLockMask(procLock->holdMask, conflictMask) &&
!IsProcessWaitingForRelationExtension(currentProc)) !IsProcessWaitingForSafeOperations(currentProc))
{ {
AddWaitEdge(waitGraph, waitingProc, currentProc, remaining); AddWaitEdge(waitGraph, waitingProc, currentProc, remaining);
} }
@ -640,12 +641,12 @@ AddEdgesForWaitQueue(WaitGraph *waitGraph, PGPROC *waitingProc, PROCStack *remai
/* /*
* Skip processes from the same lock group, processes that don't conflict, * Skip processes from the same lock group, processes that don't conflict,
* and processes that are waiting on a relation extension lock, which * and processes that are waiting on a relation extension lock or page locks,
* will be released shortly. * which will be released shortly.
*/ */
if (!IsSameLockGroup(waitingProc, currentProc) && if (!IsSameLockGroup(waitingProc, currentProc) &&
IsConflictingLockMask(awaitMask, conflictMask) && IsConflictingLockMask(awaitMask, conflictMask) &&
!IsProcessWaitingForRelationExtension(currentProc)) !IsProcessWaitingForSafeOperations(currentProc))
{ {
AddWaitEdge(waitGraph, waitingProc, currentProc, remaining); AddWaitEdge(waitGraph, waitingProc, currentProc, remaining);
} }
@ -676,7 +677,7 @@ AddWaitEdge(WaitGraph *waitGraph, PGPROC *waitingProc, PGPROC *blockingProc,
curEdge->isBlockingXactWaiting = curEdge->isBlockingXactWaiting =
IsProcessWaitingForLock(blockingProc) && IsProcessWaitingForLock(blockingProc) &&
!IsProcessWaitingForRelationExtension(blockingProc); !IsProcessWaitingForSafeOperations(blockingProc);
if (curEdge->isBlockingXactWaiting) if (curEdge->isBlockingXactWaiting)
{ {
AddProcToVisit(remaining, blockingProc); AddProcToVisit(remaining, blockingProc);