Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix deadlock during waiting for apply worker stop (issue #258) #260

Open
wants to merge 11 commits into
base: REL2_x_STABLE
Choose a base branch
from
Open

fix deadlock during waiting for apply worker stop (issue #258) #260

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1e077af
Fixing deadlock during waiting for apply worker stop.
May 25, 2020
1b0a0ac
Codestyle: fixing idents
May 25, 2020
3efe43c
Couple of small changes to make coverity happier
PJMODOS Apr 2, 2019
e57b86b
Quick hack to compile with recent export of AcquireDeletionLock
PJMODOS May 7, 2020
81e4c80
Bump version to 2.3.2
petere May 25, 2020
fad32d7
Merge remote-tracking branch 'upstream/REL2_x_STABLE' into REL2_x_STABLE
Jun 1, 2021
7583ea1
Merge branch '2ndQuadrant:REL2_x_STABLE' into REL2_x_STABLE
DenisRazinkin Jun 1, 2021
c38f96f
Merge branch 'REL2_x_STABLE' of https://github.com/Denis-Razinkin/pgl…
Jun 1, 2021
77bad00
fix endless queue replication
Jun 4, 2021
d4e6466
Add sub_data_replace and sub_after_sync_queries fields for subscription.
Jun 8, 2021
030dd14
Merge pull request #1 from DenisRazinkin/data_replace_after_sync_queries
DenisRazinkin Jun 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions pglogical_functions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@

#include "storage/ipc.h"
#include "storage/latch.h"
#include "storage/lmgr.h"
#include "storage/proc.h"

#include "tcop/tcopprot.h"
Expand Down Expand Up @@ -600,6 +601,23 @@ pglogical_drop_subscription(PG_FUNCTION_ARGS)
LWLockRelease(PGLogicalCtx->lock);
break;
}

if (apply->proc->waitLock)
{
const LOCKTAG apply_lock_tag = apply->proc->waitLock->tag;
if (((LockTagType) apply_lock_tag.locktag_type == LOCKTAG_TRANSACTION) &&
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This check works only for 2 processes deadlock cycle (apply worker and drop sub process).
PostgreSQL deadlock detection ( DeadLockCheck(PGPROC *proc) ) is not working here because drop subscription worker do not locked by apply worker, it just waiting for apply being stopped.

(apply_lock_tag.locktag_field1 == (uint32)GetCurrentTransactionId()))
{
StringInfoData buf;
initStringInfo(&buf);
DescribeLockTag(&buf, &apply_lock_tag);
elog( WARNING, "Apply worker [%d] is locked by %s of [%d], try to kill it", apply->proc->pid, buf.data, MyProc->pid );

/* cancel transaction */
kill(apply->proc->pid, SIGINT);
}
}

LWLockRelease(PGLogicalCtx->lock);

CHECK_FOR_INTERRUPTS();
Expand Down