database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-05 09:19:17 +03:00
Code

Fix possible null pointer dereference or invalid warning message.

Browse Source 
Thinko in commit de4389712: this warning message references the wrong
"LogicalRepWorker *" variable.  This would often result in a core dump,
but if it didn't, the message would show the wrong subscription OID.

In passing, adjust the message text to format a subscription OID
similarly to how that's done elsewhere in the function; and fix
grammatical issues in some nearby messages.

Per Coverity testing.
This commit is contained in:
Tom Lane 2017-04-30 12:21:02 -04:00
parent c23844212d
commit 12d11432b4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/replication/logical/launcher.c
View File

@ -315,8 +315,8 @@ retry:
wal_receiver_timeout)) wal_receiver_timeout))
{ {
elog(WARNING, elog(WARNING,
"logical replication worker for subscription \"%d\" took too long to start; canceled", "logical replication worker for subscription %u took too long to start; canceled",
worker->subid); w->subid);
logicalrep_worker_cleanup(w); logicalrep_worker_cleanup(w);
did_cleanup = true; did_cleanup = true;
@ -347,7 +347,7 @@ retry:
LWLockRelease(LogicalRepWorkerLock); LWLockRelease(LogicalRepWorkerLock);
ereport(WARNING, ereport(WARNING,
(errcode(ERRCODE_CONFIGURATION_LIMIT_EXCEEDED), (errcode(ERRCODE_CONFIGURATION_LIMIT_EXCEEDED),
errmsg("out of logical replication workers slots"), errmsg("out of logical replication worker slots"),
errhint("You might need to increase max_logical_replication_workers."))); errhint("You might need to increase max_logical_replication_workers.")));
return; return;
} }
@ -393,7 +393,7 @@ retry:
{ {
ereport(WARNING, ereport(WARNING,
(errcode(ERRCODE_CONFIGURATION_LIMIT_EXCEEDED), (errcode(ERRCODE_CONFIGURATION_LIMIT_EXCEEDED),
errmsg("out of background workers slots"), errmsg("out of background worker slots"),
errhint("You might need to increase max_worker_processes."))); errhint("You might need to increase max_worker_processes.")));
return; return;
} }