From 6d2f6ec75f160dce622d77ac55bc50858c337527 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Tue, 14 Feb 2017 10:39:51 -0500 Subject: [PATCH 2/3] Change failures in RegisterBackgroundWorker() to hard errors Previously, just a log message was written and the background worker registration was ignored. --- src/backend/postmaster/bgworker.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/backend/postmaster/bgworker.c b/src/backend/postmaster/bgworker.c index db25a7f68b..a42bd0f758 100644 --- a/src/backend/postmaster/bgworker.c +++ b/src/backend/postmaster/bgworker.c @@ -790,19 +790,19 @@ RegisterBackgroundWorker(BackgroundWorker *worker) if (!process_shared_preload_libraries_in_progress && !internal) { if (!IsUnderPostmaster) - ereport(LOG, + ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("background worker \"%s\": must be registered in shared_preload_libraries", worker->bgw_name))); return; } - if (!SanityCheckBackgroundWorker(worker, LOG)) + if (!SanityCheckBackgroundWorker(worker, ERROR)) return; if (worker->bgw_notify_pid != 0) { - ereport(LOG, + ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("background worker \"%s\": only dynamic background workers can request notification", worker->bgw_name))); @@ -817,7 +817,7 @@ RegisterBackgroundWorker(BackgroundWorker *worker) */ if (++numworkers > max_worker_processes) { - ereport(LOG, + ereport(ERROR, (errcode(ERRCODE_CONFIGURATION_LIMIT_EXCEEDED), errmsg("too many background workers"), errdetail_plural("Up to %d background worker can be registered with the current settings.", @@ -835,7 +835,7 @@ RegisterBackgroundWorker(BackgroundWorker *worker) rw = malloc(sizeof(RegisteredBgWorker)); if (rw == NULL) { - ereport(LOG, + ereport(ERROR, (errcode(ERRCODE_OUT_OF_MEMORY), errmsg("out of memory"))); return; -- 2.11.1