diff options
| author | Noah Misch | 2015-01-08 03:46:59 +0000 |
|---|---|---|
| committer | Noah Misch | 2015-01-08 03:46:59 +0000 |
| commit | 2048e5b88198213ae15c4b59ddbe124f1a5dc2b7 (patch) | |
| tree | bca781500c1f94b412e40131617cafb8975a0ca8 | |
| parent | 894459e59ffa5c7fee297b246c17e1f72564db1d (diff) | |
On Darwin, refuse postmaster startup when multithreaded.
The previous commit introduced its report at LOG level to avoid
surprises at minor release upgrade time. Compel users deploying the
next major release to also deploy the reported workaround.
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index f33c4fed81..e2b3b8114d 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -1216,7 +1216,7 @@ PostmasterMain(int argc, char *argv[]) * normal case on Windows, which offers neither fork() nor sigprocmask(). */ if (pthread_is_threaded_np() != 0) - ereport(LOG, + ereport(FATAL, (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), errmsg("postmaster became multithreaded during startup"), errhint("Set the LC_ALL environment variable to a valid locale."))); @@ -4781,11 +4781,14 @@ ExitPostmaster(int status) /* * There is no known cause for a postmaster to become multithreaded after * startup. Recheck to account for the possibility of unknown causes. + * This message uses LOG level, because an unclean shutdown at this point + * would usually not look much different from a clean shutdown. */ if (pthread_is_threaded_np() != 0) ereport(LOG, - (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), - errmsg("postmaster became multithreaded"))); + (errcode(ERRCODE_INTERNAL_ERROR), + errmsg_internal("postmaster became multithreaded"), + errdetail("Please report this to <pgsql-bugs@postgresql.org>."))); #endif /* should cleanup shared memory and kill all backends */ |