Unbreak lock conflict detection for Hot Standby.

This got broken in the original fast-path locking patch, because
I failed to account for the fact that Hot Standby startup process
might take a strong relation lock on a relation in a database to
which it is not bound, and confused MyDatabaseId with the database
ID of the relation being locked.

Report and diagnosis by Andres Freund.  Final form of patch by me.

diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
index 444735f0b2ffef6f47fb17cd35f27a1853a41941..0997825bc4ec64c15649acdcbe26cc6de4f4a642 100644 (file)
--- a/src/backend/storage/lmgr/lock.c
+++ b/src/backend/storage/lmgr/lock.c
@@ -2296,8 +2296,8 @@ FastPathTransferRelationLocks(LockMethod lockMethodTable, const LOCKTAG *locktag
                LWLockAcquire(proc->backendLock, LW_EXCLUSIVE);
 
                /*
-                * If the target backend isn't referencing the same database as we
-                * are, then we needn't examine the individual relation IDs at all;
+                * If the target backend isn't referencing the same database as the
+                * lock, then we needn't examine the individual relation IDs at all;
                 * none of them can be relevant.
                 *
                 * proc->databaseId is set at backend startup time and never changes
@@ -2310,7 +2310,7 @@ FastPathTransferRelationLocks(LockMethod lockMethodTable, const LOCKTAG *locktag
                 * fencing operation since the other backend set proc->databaseId.      So
                 * for now, we test it after acquiring the LWLock just to be safe.
                 */
-               if (proc->databaseId != MyDatabaseId)
+               if (proc->databaseId != locktag->locktag_field1)
                {
                        LWLockRelease(proc->backendLock);
                        continue;
@@ -2528,14 +2528,14 @@ GetLockConflicts(const LOCKTAG *locktag, LOCKMODE lockmode)
                        LWLockAcquire(proc->backendLock, LW_SHARED);
 
                        /*
-                        * If the target backend isn't referencing the same database as we
-                        * are, then we needn't examine the individual relation IDs at
+                        * If the target backend isn't referencing the same database as the
+                        * lock, then we needn't examine the individual relation IDs at
                         * all; none of them can be relevant.
                         *
                         * See FastPathTransferLocks() for discussion of why we do this
                         * test after acquiring the lock.
                         */
-                       if (proc->databaseId != MyDatabaseId)
+                       if (proc->databaseId != locktag->locktag_field1)
                        {
                                LWLockRelease(proc->backendLock);
                                continue;