summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2024-04-02 18:59:04 +0000
committerTom Lane2024-04-02 18:59:32 +0000
commit6faca9ae2878c8f642a2e5748d2dbb2b91341bec (patch)
tree52b5c98b4232cc3bb94aafec74fc76341793dc41
parent4133c1f45c54f0e52b4bb758f67af78951930e43 (diff)
Avoid deadlock during orphan temp table removal.
If temp tables have dependencies (such as sequences) then it's possible for autovacuum's cleanup of orphan temp tables to deadlock against an incoming backend that's trying to clean out the temp namespace for its own use. That can happen because RemoveTempRelations' performDeletion call can visit objects within the namespace in an order different from the order in which a per-table deletion will visit them. To fix, observe that performDeletion will begin by taking an exclusive lock on the temp namespace (even though it won't actually delete it). So, if we can get a shared lock on the namespace, we can be sure we're not running concurrently with RemoveTempRelations, while also not conflicting with ordinary use of the namespace. This requires introducing a conditional version of LockDatabaseObject, but that's no big deal. (It's surprising we've got along without that this long.) Report and patch by Mikhail Zhilin. Back-patch to all supported branches. Discussion: https://postgr.es/m/[email protected]
-rw-r--r--src/backend/postmaster/autovacuum.c21
-rw-r--r--src/backend/storage/lmgr/lmgr.c38
-rw-r--r--src/include/storage/lmgr.h2
3 files changed, 60 insertions, 1 deletions
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index 71e8a6f2584..c367ede6f88 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -76,6 +76,7 @@
#include "catalog/dependency.h"
#include "catalog/namespace.h"
#include "catalog/pg_database.h"
+#include "catalog/pg_namespace.h"
#include "commands/dbcommands.h"
#include "commands/vacuum.h"
#include "common/int.h"
@@ -2175,6 +2176,24 @@ do_autovacuum(void)
continue;
}
+ /*
+ * Try to lock the temp namespace, too. Even though we have lock on
+ * the table itself, there's a risk of deadlock against an incoming
+ * backend trying to clean out the temp namespace, in case this table
+ * has dependencies (such as sequences) that the backend's
+ * performDeletion call might visit in a different order. If we can
+ * get AccessShareLock on the namespace, that's sufficient to ensure
+ * we're not running concurrently with RemoveTempRelations. If we
+ * can't, back off and let RemoveTempRelations do its thing.
+ */
+ if (!ConditionalLockDatabaseObject(NamespaceRelationId,
+ classForm->relnamespace, 0,
+ AccessShareLock))
+ {
+ UnlockRelationOid(relid, AccessExclusiveLock);
+ continue;
+ }
+
/* OK, let's delete it */
ereport(LOG,
(errmsg("autovacuum: dropping orphan temp table \"%s.%s.%s\"",
@@ -2192,7 +2211,7 @@ do_autovacuum(void)
/*
* To commit the deletion, end current transaction and start a new
- * one. Note this also releases the lock we took.
+ * one. Note this also releases the locks we took.
*/
CommitTransactionCommand();
StartTransactionCommand();
diff --git a/src/backend/storage/lmgr/lmgr.c b/src/backend/storage/lmgr/lmgr.c
index 41fd856c654..fe3cda2f88a 100644
--- a/src/backend/storage/lmgr/lmgr.c
+++ b/src/backend/storage/lmgr/lmgr.c
@@ -1019,6 +1019,44 @@ LockDatabaseObject(Oid classid, Oid objid, uint16 objsubid,
}
/*
+ * ConditionalLockDatabaseObject
+ *
+ * As above, but only lock if we can get the lock without blocking.
+ * Returns true iff the lock was acquired.
+ */
+bool
+ConditionalLockDatabaseObject(Oid classid, Oid objid, uint16 objsubid,
+ LOCKMODE lockmode)
+{
+ LOCKTAG tag;
+ LOCALLOCK *locallock;
+ LockAcquireResult res;
+
+ SET_LOCKTAG_OBJECT(tag,
+ MyDatabaseId,
+ classid,
+ objid,
+ objsubid);
+
+ res = LockAcquireExtended(&tag, lockmode, false, true, true, &locallock);
+
+ if (res == LOCKACQUIRE_NOT_AVAIL)
+ return false;
+
+ /*
+ * Now that we have the lock, check for invalidation messages; see notes
+ * in LockRelationOid.
+ */
+ if (res != LOCKACQUIRE_ALREADY_CLEAR)
+ {
+ AcceptInvalidationMessages();
+ MarkLockClear(locallock);
+ }
+
+ return true;
+}
+
+/*
* UnlockDatabaseObject
*/
void
diff --git a/src/include/storage/lmgr.h b/src/include/storage/lmgr.h
index e8bd71ba689..22b7856ef1f 100644
--- a/src/include/storage/lmgr.h
+++ b/src/include/storage/lmgr.h
@@ -93,6 +93,8 @@ extern void SpeculativeInsertionWait(TransactionId xid, uint32 token);
/* Lock a general object (other than a relation) of the current database */
extern void LockDatabaseObject(Oid classid, Oid objid, uint16 objsubid,
LOCKMODE lockmode);
+extern bool ConditionalLockDatabaseObject(Oid classid, Oid objid,
+ uint16 objsubid, LOCKMODE lockmode);
extern void UnlockDatabaseObject(Oid classid, Oid objid, uint16 objsubid,
LOCKMODE lockmode);