From 56d2dcf9a82aac3fa1438e38c9f15fe43fd7c025 Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Wed, 31 Mar 2021 00:50:28 -0700 Subject: [PATCH v60 03/17] Explicitly detach from dsm in ParallelWorkerShutdown(). --- src/backend/access/transam/parallel.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/backend/access/transam/parallel.c b/src/backend/access/transam/parallel.c index 3550ef13baa..3fe74b9cec5 100644 --- a/src/backend/access/transam/parallel.c +++ b/src/backend/access/transam/parallel.c @@ -1305,7 +1305,7 @@ ParallelWorkerMain(Datum main_arg) /* Arrange to signal the leader if we exit. */ ParallelLeaderPid = fps->parallel_leader_pid; ParallelLeaderBackendId = fps->parallel_leader_backend_id; - on_shmem_exit(ParallelWorkerShutdown, (Datum) 0); + before_shmem_exit(ParallelWorkerShutdown, PointerGetDatum(seg)); /* * Now we can find and attach to the error queue provided for us. That's @@ -1507,6 +1507,10 @@ ParallelWorkerReportLastRecEnd(XLogRecPtr last_xlog_end) * This guards against the case where we exit uncleanly without sending an * ErrorResponse to the leader, for example because some code calls proc_exit * directly. + * + * Also explicitly detach from dsm segment so that subsystems using + * on_dsm_detach() have a chance to send stats before the stats subsystem is + * shut down as as part of a before_shmem_exit() hook. */ static void ParallelWorkerShutdown(int code, Datum arg) @@ -1514,6 +1518,8 @@ ParallelWorkerShutdown(int code, Datum arg) SendProcSignal(ParallelLeaderPid, PROCSIG_PARALLEL_MESSAGE, ParallelLeaderBackendId); + + dsm_detach((dsm_segment*) DatumGetPointer(arg)); } /* -- 2.31.0.121.g9198c13e34