PostmasterIsAlive test really ought to be in the inner loop for safety.

tglsfdc · tglsfdc · commit 3993bd8e07a3 · 2006-05-30T17:08:14.000Z
diff --git a/src/backend/postmaster/pgarch.c b/src/backend/postmaster/pgarch.c
@@ -19,7 +19,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/postmaster/pgarch.c,v 1.21 2006/05/30 13:30:49 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/pgarch.c,v 1.22 2006/05/30 17:08:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -352,12 +352,16 @@ pgarch_ArchiverCopyLoop(void)
 	 * some backend will add files onto the list of those that need archiving
 	 * while we are still copying earlier archives
 	 */
-	while (PostmasterIsAlive(true) && pgarch_readyXlog(xlog))
+	while (pgarch_readyXlog(xlog))
 	{
 		int			failures = 0;
 
 		for (;;)
 		{
+			/* Abandon processing if we notice our postmaster has died */
+			if (!PostmasterIsAlive(true))
+				return;
+
 			if (pgarch_archiveXlog(xlog))
 			{
 				/* successful */

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`*`
`20`	`20`	`*`
`21`	`21`	`* IDENTIFICATION`
`22`		`- * $PostgreSQL: pgsql/src/backend/postmaster/pgarch.c,v 1.21 2006/05/30 13:30:49 momjian Exp $`
	`22`	`+ * $PostgreSQL: pgsql/src/backend/postmaster/pgarch.c,v 1.22 2006/05/30 17:08:14 tgl Exp $`
`23`	`23`	`*`
`24`	`24`	`*-------------------------------------------------------------------------`
`25`	`25`	`*/`
`@@ -352,12 +352,16 @@ pgarch_ArchiverCopyLoop(void)`
`352`	`352`	`* some backend will add files onto the list of those that need archiving`
`353`	`353`	`* while we are still copying earlier archives`
`354`	`354`	`*/`
`355`		`- while (PostmasterIsAlive(true) && pgarch_readyXlog(xlog))`
	`355`	`+ while (pgarch_readyXlog(xlog))`
`356`	`356`	`{`
`357`	`357`	`int failures = 0;`
`358`	`358`
`359`	`359`	`for (;;)`
`360`	`360`	`{`
	`361`	`+ /* Abandon processing if we notice our postmaster has died */`
	`362`	`+ if (!PostmasterIsAlive(true))`
	`363`	`+ return;`
	`364`	`+`
`361`	`365`	`if (pgarch_archiveXlog(xlog))`
`362`	`366`	`{`
`363`	`367`	`/* successful */`