Fix possible null pointer dereference or invalid warning message.

tglsfdc · tglsfdc · commit 12d11432b4db · 2017-04-30T12:21:02.000-04:00
Thinko in commit de43897: 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.
diff --git a/src/backend/replication/logical/launcher.c b/src/backend/replication/logical/launcher.c
@@ -315,8 +315,8 @@ logicalrep_worker_launch(Oid dbid, Oid subid, const char *subname, Oid userid,
 										   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 @@ logicalrep_worker_launch(Oid dbid, Oid subid, const char *subname, Oid userid,
 		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 @@ logicalrep_worker_launch(Oid dbid, Oid subid, const char *subname, Oid userid,
 	{
 		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;
 	}
