agora inbox for pgsql-hackers@postgresql.org
help / color / mirror / Atom feedFrom: Nathan Bossart <nathandbossart@gmail.com>
Subject: [PATCH v17 4/4] Do not delay shutdown due to long-running custodian tasks.
Date: Mon, 28 Nov 2022 15:15:37 -0800
These tasks are not essential enough to delay shutdown and can be
retried the next time the server is running.
---
src/backend/access/heap/rewriteheap.c | 9 +++++++++
src/backend/postmaster/custodian.c | 8 ++++++++
src/backend/replication/logical/snapbuild.c | 9 +++++++++
3 files changed, 26 insertions(+)
diff --git a/src/backend/access/heap/rewriteheap.c b/src/backend/access/heap/rewriteheap.c
index ff4cd8cef9..a098060d76 100644
--- a/src/backend/access/heap/rewriteheap.c
+++ b/src/backend/access/heap/rewriteheap.c
@@ -117,6 +117,7 @@
#include "miscadmin.h"
#include "pgstat.h"
#include "postmaster/custodian.h"
+#include "postmaster/interrupt.h"
#include "replication/logical.h"
#include "replication/slot.h"
#include "storage/bufmgr.h"
@@ -1313,6 +1314,14 @@ RemoveOldLogicalRewriteMappings(void)
lo;
PGFileType de_type;
+ /*
+ * This task is not essential enough to delay shutdown, so bail out if
+ * there's a pending shutdown request. We'll try again the next time
+ * the server is running.
+ */
+ if (ShutdownRequestPending)
+ break;
+
if (strcmp(mapping_de->d_name, ".") == 0 ||
strcmp(mapping_de->d_name, "..") == 0)
continue;
diff --git a/src/backend/postmaster/custodian.c b/src/backend/postmaster/custodian.c
index c4d0a22451..394b7047af 100644
--- a/src/backend/postmaster/custodian.c
+++ b/src/backend/postmaster/custodian.c
@@ -231,6 +231,14 @@ DoCustodianTasks(void)
{
CustodianTaskFunction func = (LookupCustodianFunctions(task))->task_func;
+ /*
+ * Custodian tasks are not essential enough to delay shutdown, so bail
+ * out if there's a pending shutdown request. Tasks should be
+ * requested again and retried the next time the server is running.
+ */
+ if (ShutdownRequestPending)
+ break;
+
PG_TRY();
{
(*func) ();
diff --git a/src/backend/replication/logical/snapbuild.c b/src/backend/replication/logical/snapbuild.c
index e7c4f69b42..939ad4c4ab 100644
--- a/src/backend/replication/logical/snapbuild.c
+++ b/src/backend/replication/logical/snapbuild.c
@@ -126,6 +126,7 @@
#include "common/file_utils.h"
#include "miscadmin.h"
#include "pgstat.h"
+#include "postmaster/interrupt.h"
#include "replication/logical.h"
#include "replication/reorderbuffer.h"
#include "replication/snapbuild.h"
@@ -2072,6 +2073,14 @@ RemoveOldSerializedSnapshots(void)
XLogRecPtr lsn;
PGFileType de_type;
+ /*
+ * This task is not essential enough to delay shutdown, so bail out if
+ * there's a pending shutdown request. We'll try again the next time
+ * the server is running.
+ */
+ if (ShutdownRequestPending)
+ break;
+
if (strcmp(snap_de->d_name, ".") == 0 ||
strcmp(snap_de->d_name, "..") == 0)
continue;
--
2.25.1
--ew6BAiZeqk4r7MaW--
view thread (9+ messages)
Message-ID: <no-message-id-635727@localhost>
Permalink: ../../no-message-id-635727@localhost/
Also on: postgresql.org/message-id/no-message-id-635727@localhost
reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: pgsql-hackers@postgresql.org
Cc: nathandbossart@gmail.com
Subject: Re: [PATCH v17 4/4] Do not delay shutdown due to long-running custodian tasks.
In-Reply-To: <no-message-id-635727@localhost>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox