v18-0003-Try-to-enable-transaction_timeout-before-next-co.patch
application/octet-stream
Filename: v18-0003-Try-to-enable-transaction_timeout-before-next-co.patch
Type: application/octet-stream
Part: 2
Message:
Re: Transaction timeout
Patch
Format: format-patch
Series: patch v18-0003
Subject: Try to enable transaction_timeout before next command
| File | + | − |
|---|---|---|
| src/backend/tcop/postgres.c | 10 | 0 |
From f1d62f40825b8d8989d85dee3a4152938ad94508 Mon Sep 17 00:00:00 2001
From: japinli <japinli@hotmail.com>
Date: Sat, 23 Dec 2023 11:04:25 +0800
Subject: [PATCH v18 3/3] Try to enable transaction_timeout before next command
---
src/backend/tcop/postgres.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index a2611cf8e6..96161eb7ab 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -4513,6 +4513,11 @@ PostgresMain(const char *dbname, const char *username)
enable_timeout_after(IDLE_IN_TRANSACTION_SESSION_TIMEOUT,
IdleInTransactionSessionTimeout);
}
+
+ /* Schedule or reschedule transaction timeout */
+ if (TransactionTimeout > 0 && !get_timeout_active(TRANSACTION_TIMEOUT))
+ enable_timeout_after(TRANSACTION_TIMEOUT,
+ TransactionTimeout);
}
else if (IsTransactionOrTransactionBlock())
{
@@ -4527,6 +4532,11 @@ PostgresMain(const char *dbname, const char *username)
enable_timeout_after(IDLE_IN_TRANSACTION_SESSION_TIMEOUT,
IdleInTransactionSessionTimeout);
}
+
+ /* Schedule or reschedule transaction timeout */
+ if (TransactionTimeout > 0 && !get_timeout_active(TRANSACTION_TIMEOUT))
+ enable_timeout_after(TRANSACTION_TIMEOUT,
+ TransactionTimeout);
}
else
{
--
2.37.1 (Apple Git-137.1)