Handle invalid libpq sockets in more places

petere · petere · commit a40814d7aacb · 2016-03-08T21:10:33.000-05:00
Also, make error messages consistent.

From: Michael Paquier &lt;michael.paquier@gmail.com&gt;
diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
@@ -331,7 +331,7 @@ libpq_select(int timeout_ms)
 	if (PQsocket(streamConn) < 0)
 		ereport(ERROR,
 				(errcode_for_socket_access(),
-				 errmsg("socket not open")));
+				 errmsg("invalid socket: %s", PQerrorMessage(streamConn))));
 
 	/* We use poll(2) if available, otherwise select(2) */
 	{
diff --git a/src/bin/pg_basebackup/pg_recvlogical.c b/src/bin/pg_basebackup/pg_recvlogical.c
@@ -360,6 +360,14 @@ StreamLogicalLog(void)
 			struct timeval timeout;
 			struct timeval *timeoutptr = NULL;
 
+			if (PQsocket(conn) < 0)
+			{
+				fprintf(stderr,
+						_("%s: invalid socket: %s"),
+						progname, PQerrorMessage(conn));
+				goto error;
+			}
+
 			FD_ZERO(&input_mask);
 			FD_SET(PQsocket(conn), &input_mask);
 
diff --git a/src/bin/pg_basebackup/receivelog.c b/src/bin/pg_basebackup/receivelog.c
@@ -956,7 +956,8 @@ CopyStreamPoll(PGconn *conn, long timeout_ms)
 
 	if (PQsocket(conn) < 0)
 	{
-		fprintf(stderr, _("%s: socket not open"), progname);
+		fprintf(stderr, _("%s: invalid socket: %s"), progname,
+				PQerrorMessage(conn));
 		return -1;
 	}
 
diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c
@@ -3797,7 +3797,7 @@ threadRun(void *arg)
 			sock = PQsocket(st->con);
 			if (sock < 0)
 			{
-				fprintf(stderr, "bad socket: %s", PQerrorMessage(st->con));
+				fprintf(stderr, "invalid socket: %s", PQerrorMessage(st->con));
 				goto done;
 			}
 
@@ -3867,7 +3867,8 @@ threadRun(void *arg)
 
 				if (sock < 0)
 				{
-					fprintf(stderr, "bad socket: %s", PQerrorMessage(st->con));
+					fprintf(stderr, "invalid socket: %s",
+							PQerrorMessage(st->con));
 					goto done;
 				}
 				if (FD_ISSET(sock, &input_mask) ||
diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c
@@ -70,7 +70,7 @@ static void DisconnectDatabase(ParallelSlot *slot);
 
 static int	select_loop(int maxFd, fd_set *workerset, bool *aborting);
 
-static void init_slot(ParallelSlot *slot, PGconn *conn);
+static void init_slot(ParallelSlot *slot, PGconn *conn, const char *progname);
 
 static void help(const char *progname);
 
@@ -421,14 +421,14 @@ vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
 	 * array contains the connection.
 	 */
 	slots = (ParallelSlot *) pg_malloc(sizeof(ParallelSlot) * concurrentCons);
-	init_slot(slots, conn);
+	init_slot(slots, conn, progname);
 	if (parallel)
 	{
 		for (i = 1; i < concurrentCons; i++)
 		{
 			conn = connectDatabase(dbname, host, port, username, prompt_password,
 								   progname, false, true);
-			init_slot(slots + i, conn);
+			init_slot(slots + i, conn, progname);
 		}
 	}
 
@@ -917,11 +917,18 @@ select_loop(int maxFd, fd_set *workerset, bool *aborting)
 }
 
 static void
-init_slot(ParallelSlot *slot, PGconn *conn)
+init_slot(ParallelSlot *slot, PGconn *conn, const char *progname)
 {
 	slot->connection = conn;
 	slot->isFree = true;
 	slot->sock = PQsocket(conn);
+
+	if (slot->sock < 0)
+	{
+		fprintf(stderr, _("%s: invalid socket: %s"), progname,
+				PQerrorMessage(conn));
+		exit(1);
+	}
 }
 
 static void
diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c
@@ -1058,7 +1058,7 @@ pqSocketCheck(PGconn *conn, int forRead, int forWrite, time_t end_time)
 	if (conn->sock == PGINVALID_SOCKET)
 	{
 		printfPQExpBuffer(&conn->errorMessage,
-						  libpq_gettext("socket not open\n"));
+						  libpq_gettext("invalid socket\n"));
 		return -1;
 	}
 
diff --git a/src/test/isolation/isolationtester.c b/src/test/isolation/isolationtester.c
@@ -705,6 +705,12 @@ try_complete_step(Step *step, int flags)
 	PGresult   *res;
 	bool		canceled = false;
 
+	if (sock < 0)
+	{
+		fprintf(stderr, "invalid socket: %s", PQerrorMessage(conn));
+		exit_nicely();
+	}
+
 	gettimeofday(&start_time, NULL);
 	FD_ZERO(&read_set);
 

Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,7 @@ libpq_select(int timeout_ms)`
`331`	`331`	`if (PQsocket(streamConn) < 0)`
`332`	`332`	`ereport(ERROR,`
`333`	`333`	`(errcode_for_socket_access(),`
`334`		`- errmsg("socket not open")));`
	`334`	`+ errmsg("invalid socket: %s", PQerrorMessage(streamConn))));`
`335`	`335`
`336`	`336`	`/* We use poll(2) if available, otherwise select(2) */`
`337`	`337`	`{`
Original file line number	Diff line number	Diff line change
`@@ -956,7 +956,8 @@ CopyStreamPoll(PGconn *conn, long timeout_ms)`
`956`	`956`
`957`	`957`	`if (PQsocket(conn) < 0)`
`958`	`958`	`{`
`959`		`- fprintf(stderr, _("%s: socket not open"), progname);`
	`959`	`+ fprintf(stderr, _("%s: invalid socket: %s"), progname,`
	`960`	`+ PQerrorMessage(conn));`
`960`	`961`	`return -1;`
`961`	`962`	`}`
`962`	`963`
Original file line number	Diff line number	Diff line change
`@@ -3797,7 +3797,7 @@ threadRun(void *arg)`
`3797`	`3797`	`sock = PQsocket(st->con);`
`3798`	`3798`	`if (sock < 0)`
`3799`	`3799`	`{`
`3800`		`- fprintf(stderr, "bad socket: %s", PQerrorMessage(st->con));`
	`3800`	`+ fprintf(stderr, "invalid socket: %s", PQerrorMessage(st->con));`
`3801`	`3801`	`goto done;`
`3802`	`3802`	`}`
`3803`	`3803`
`@@ -3867,7 +3867,8 @@ threadRun(void *arg)`
`3867`	`3867`
`3868`	`3868`	`if (sock < 0)`
`3869`	`3869`	`{`
`3870`		`- fprintf(stderr, "bad socket: %s", PQerrorMessage(st->con));`
	`3870`	`+ fprintf(stderr, "invalid socket: %s",`
	`3871`	`+ PQerrorMessage(st->con));`
`3871`	`3872`	`goto done;`
`3872`	`3873`	`}`
`3873`	`3874`	`if (FD_ISSET(sock, &input_mask) \|\|`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ static void DisconnectDatabase(ParallelSlot *slot);`
`70`	`70`
`71`	`71`	`static int select_loop(int maxFd, fd_set workerset, bool aborting);`
`72`	`72`
`73`		`-static void init_slot(ParallelSlot slot, PGconn conn);`
	`73`	`+static void init_slot(ParallelSlot slot, PGconn conn, const char *progname);`
`74`	`74`
`75`	`75`	`static void help(const char *progname);`
`76`	`76`
`@@ -421,14 +421,14 @@ vacuum_one_database(const char dbname, vacuumingOptions vacopts,`
`421`	`421`	`* array contains the connection.`
`422`	`422`	`*/`
`423`	`423`	`slots = (ParallelSlot ) pg_malloc(sizeof(ParallelSlot) concurrentCons);`
`424`		`- init_slot(slots, conn);`
	`424`	`+ init_slot(slots, conn, progname);`
`425`	`425`	`if (parallel)`
`426`	`426`	`{`
`427`	`427`	`for (i = 1; i < concurrentCons; i++)`
`428`	`428`	`{`
`429`	`429`	`conn = connectDatabase(dbname, host, port, username, prompt_password,`
`430`	`430`	`progname, false, true);`
`431`		`- init_slot(slots + i, conn);`
	`431`	`+ init_slot(slots + i, conn, progname);`
`432`	`432`	`}`
`433`	`433`	`}`
`434`	`434`
`@@ -917,11 +917,18 @@ select_loop(int maxFd, fd_set workerset, bool aborting)`
`917`	`917`	`}`
`918`	`918`
`919`	`919`	`static void`
`920`		`-init_slot(ParallelSlot slot, PGconn conn)`
	`920`	`+init_slot(ParallelSlot slot, PGconn conn, const char *progname)`
`921`	`921`	`{`
`922`	`922`	`slot->connection = conn;`
`923`	`923`	`slot->isFree = true;`
`924`	`924`	`slot->sock = PQsocket(conn);`
	`925`	`+`
	`926`	`+ if (slot->sock < 0)`
	`927`	`+ {`
	`928`	`+ fprintf(stderr, _("%s: invalid socket: %s"), progname,`
	`929`	`+ PQerrorMessage(conn));`
	`930`	`+ exit(1);`
	`931`	`+ }`
`925`	`932`	`}`
`926`	`933`
`927`	`934`	`static void`
Original file line number	Diff line number	Diff line change
`@@ -1058,7 +1058,7 @@ pqSocketCheck(PGconn *conn, int forRead, int forWrite, time_t end_time)`
`1058`	`1058`	`if (conn->sock == PGINVALID_SOCKET)`
`1059`	`1059`	`{`
`1060`	`1060`	`printfPQExpBuffer(&conn->errorMessage,`
`1061`		`- libpq_gettext("socket not open\n"));`
	`1061`	`+ libpq_gettext("invalid socket\n"));`
`1062`	`1062`	`return -1;`
`1063`	`1063`	`}`
`1064`	`1064`