Skip to content

Commit c9ae5cb

Browse files
committed
Install an error check into cancel_before_shmem_exit().
Historically, cancel_before_shmem_exit() just silently did nothing if the specified callback wasn't the top-of-stack. The folly of ignoring this case was exposed by the bugs fixed in 3036401 and bab1500, so let's make it throw elog(ERROR) instead. There is a decent argument to be made that PG_ENSURE_ERROR_CLEANUP should use some separate infrastructure, so it wouldn't break if something inside the guarded code decides to register a new before_shmem_exit callback. However, a survey of the surviving uses of before_shmem_exit() and PG_ENSURE_ERROR_CLEANUP doesn't show any plausible conflicts of that sort today, so for now we'll forgo the extra complexity. (It will almost certainly become necessary if anyone ever wants to wrap PG_ENSURE_ERROR_CLEANUP around arbitrary user-defined actions, though.) No backpatch, since this is developer support not a production issue. Bharath Rupireddy, per advice from Andres Freund, Robert Haas, and myself Discussion: https://postgr.es/m/CALj2ACWk7j4F2v2fxxYfrroOF=AdFNPr1WsV+AGtHAFQOqm_pw@mail.gmail.com
1 parent 5871f09 commit c9ae5cb

File tree

1 file changed

+6
-3
lines changed
  • src/backend/storage/ipc

1 file changed

+6
-3
lines changed

src/backend/storage/ipc/ipc.c

+6-3
Original file line numberDiff line numberDiff line change
@@ -381,9 +381,9 @@ on_shmem_exit(pg_on_exit_callback function, Datum arg)
381381
* cancel_before_shmem_exit
382382
*
383383
* this function removes a previously-registered before_shmem_exit
384-
* callback. For simplicity, only the latest entry can be
385-
* removed. (We could work harder but there is no need for
386-
* current uses.)
384+
* callback. We only look at the latest entry for removal, as we
385+
* expect callers to add and remove temporary before_shmem_exit
386+
* callbacks in strict LIFO order.
387387
* ----------------------------------------------------------------
388388
*/
389389
void
@@ -394,6 +394,9 @@ cancel_before_shmem_exit(pg_on_exit_callback function, Datum arg)
394394
== function &&
395395
before_shmem_exit_list[before_shmem_exit_index - 1].arg == arg)
396396
--before_shmem_exit_index;
397+
else
398+
elog(ERROR, "before_shmem_exit callback (%p,0x%llx) is not the latest entry",
399+
function, (long long) arg);
397400
}
398401

399402
/* ----------------------------------------------------------------

0 commit comments

Comments
 (0)