Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd8c3896

Browse files
committed
Unbreak lock conflict detection for Hot Standby.
This got broken in the original fast-path locking patch, becauseI failed to account for the fact that Hot Standby startup processmight take a strong relation lock on a relation in a database towhich it is not bound, and confused MyDatabaseId with the databaseID of the relation being locked.Report and diagnosis by Andres Freund. Final form of patch by me.
1 parent600250d commitd8c3896

File tree

1 file changed

+6
-6
lines changed
  • src/backend/storage/lmgr

1 file changed

+6
-6
lines changed

‎src/backend/storage/lmgr/lock.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2445,8 +2445,8 @@ FastPathTransferRelationLocks(LockMethod lockMethodTable, const LOCKTAG *locktag
24452445
LWLockAcquire(proc->backendLock,LW_EXCLUSIVE);
24462446

24472447
/*
2448-
* If the target backend isn't referencing the same database aswe
2449-
*are, then we needn't examine the individual relation IDs at all;
2448+
* If the target backend isn't referencing the same database asthe
2449+
*lock, then we needn't examine the individual relation IDs at all;
24502450
* none of them can be relevant.
24512451
*
24522452
* proc->databaseId is set at backend startup time and never changes
@@ -2459,7 +2459,7 @@ FastPathTransferRelationLocks(LockMethod lockMethodTable, const LOCKTAG *locktag
24592459
* fencing operation since the other backend set proc->databaseId.So
24602460
* for now, we test it after acquiring the LWLock just to be safe.
24612461
*/
2462-
if (proc->databaseId!=MyDatabaseId)
2462+
if (proc->databaseId!=locktag->locktag_field1)
24632463
{
24642464
LWLockRelease(proc->backendLock);
24652465
continue;
@@ -2677,14 +2677,14 @@ GetLockConflicts(const LOCKTAG *locktag, LOCKMODE lockmode)
26772677
LWLockAcquire(proc->backendLock,LW_SHARED);
26782678

26792679
/*
2680-
* If the target backend isn't referencing the same database aswe
2681-
*are, then we needn't examine the individual relation IDs at
2680+
* If the target backend isn't referencing the same database asthe
2681+
*lock, then we needn't examine the individual relation IDs at
26822682
* all; none of them can be relevant.
26832683
*
26842684
* See FastPathTransferLocks() for discussion of why we do this
26852685
* test after acquiring the lock.
26862686
*/
2687-
if (proc->databaseId!=MyDatabaseId)
2687+
if (proc->databaseId!=locktag->locktag_field1)
26882688
{
26892689
LWLockRelease(proc->backendLock);
26902690
continue;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp