postgres.git / summary / log / commit / refs
commit 12d11432b4db8a2ae665287e05f0f6868d35545e
Author: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sun Apr 30 16:21:02 2017 +0000
Fix possible null pointer dereference or invalid warning message.
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.
src/backend/replication/logical/launcher.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/backend/replication/logical/launcher.c b/src/backend/replication/logical/launcher.c
index cf0cb37acc6..f5058d5a9ac 100644
--- a/src/backend/replication/logical/launcher.c
+++ b/src/backend/replication/logical/launcher.c
@@ -315,8 +315,8 @@ retry:
wal_receiver_timeout))
{
elog(WARNING,
- "logical replication worker for subscription \"%d\" took too long to start; canceled",
- worker->subid);
+ "logical replication worker for subscription %u took too long to start; canceled",
+ w->subid);
logicalrep_worker_cleanup(w);
did_cleanup = true;
@@ -347,7 +347,7 @@ retry:
LWLockRelease(LogicalRepWorkerLock);
ereport(WARNING,
(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.")));
return;
}
@@ -393,7 +393,7 @@ retry:
{
ereport(WARNING,
(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.")));
return;
}
[parent: c23844212d76]