Skip to content

Commit

Permalink
Fix bugs in GetSafeSnapshotBlockingPids(), introduced in 9600371
Browse files Browse the repository at this point in the history
While removing the use of SHM_QUEUE from predicate.c, in 9600371, I made
two mistakes in GetSafeSnapshotBlockingPids():
- Removed the check for output_size
- Previously, when the first loop didn't find a matching proc, sxact would be
  NULL. But with naive use of dlist_foreach() it ends up as the value of the
  last iteration.

The second issue is the cause of occasional failures in the deadlock-hard and
deadlock-soft isolation tests that we have been observing on CI. The issue was
very hard to reproduce, as it requires the transactions.sql regression test to
run at the same time as the deadlock-{hard,soft} isolation test.

I did not find other similar mistakes in 9600371.

Discussion: https://postgr.es/m/[email protected]
  • Loading branch information
anarazel committed Feb 9, 2023
1 parent 969509c commit 49c2c5f
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions src/backend/storage/lmgr/predicate.c
Original file line number Diff line number Diff line change
Expand Up @@ -1563,29 +1563,36 @@ GetSafeSnapshotBlockingPids(int blocked_pid, int *output, int output_size)
{
int num_written = 0;
dlist_iter iter;
SERIALIZABLEXACT *sxact = NULL;
SERIALIZABLEXACT *blocking_sxact = NULL;

LWLockAcquire(SerializableXactHashLock, LW_SHARED);

/* Find blocked_pid's SERIALIZABLEXACT by linear search. */
dlist_foreach(iter, &PredXact->activeList)
{
sxact = dlist_container(SERIALIZABLEXACT, xactLink, iter.cur);
SERIALIZABLEXACT *sxact =
dlist_container(SERIALIZABLEXACT, xactLink, iter.cur);

if (sxact->pid == blocked_pid)
{
blocking_sxact = sxact;
break;
}
}

/* Did we find it, and is it currently waiting in GetSafeSnapshot? */
if (sxact != NULL && SxactIsDeferrableWaiting(sxact))
if (blocking_sxact != NULL && SxactIsDeferrableWaiting(blocking_sxact))
{
/* Traverse the list of possible unsafe conflicts collecting PIDs. */
dlist_foreach(iter, &sxact->possibleUnsafeConflicts)
dlist_foreach(iter, &blocking_sxact->possibleUnsafeConflicts)
{
RWConflict possibleUnsafeConflict =
dlist_container(RWConflictData, inLink, iter.cur);

output[num_written++] = possibleUnsafeConflict->sxactOut->pid;

if (num_written >= output_size)
break;
}
}

Expand Down

0 comments on commit 49c2c5f

Please sign in to comment.