Change Assert() to a plain test and elog, just to see if that works

tglsfdc · tglsfdc · commit b26738b58344 · 2007-10-04T15:37:44.000Z
around the icc bug exhibited by buildfarm member dugong.
diff --git a/src/backend/postmaster/bgwriter.c b/src/backend/postmaster/bgwriter.c
@@ -37,7 +37,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/postmaster/bgwriter.c,v 1.44 2007/09/25 20:03:37 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/bgwriter.c,v 1.45 2007/10/04 15:37:44 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -996,7 +996,8 @@ ForwardFsyncRequest(RelFileNode rnode, BlockNumber segno)
 	if (!IsUnderPostmaster)
 		return false;			/* probably shouldn't even get here */
 
-	Assert(!am_bg_writer);
+	if (am_bg_writer)
+		elog(ERROR, "ForwardFsyncRequest must not be called in bgwriter");
 
 	LWLockAcquire(BgWriterCommLock, LW_EXCLUSIVE);
 

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`*`
`38`	`38`	`*`
`39`	`39`	`* IDENTIFICATION`
`40`		`- * $PostgreSQL: pgsql/src/backend/postmaster/bgwriter.c,v 1.44 2007/09/25 20:03:37 tgl Exp $`
	`40`	`+ * $PostgreSQL: pgsql/src/backend/postmaster/bgwriter.c,v 1.45 2007/10/04 15:37:44 tgl Exp $`
`41`	`41`	`*`
`42`	`42`	`*-------------------------------------------------------------------------`
`43`	`43`	`*/`
`@@ -996,7 +996,8 @@ ForwardFsyncRequest(RelFileNode rnode, BlockNumber segno)`
`996`	`996`	`if (!IsUnderPostmaster)`
`997`	`997`	`return false; /* probably shouldn't even get here */`
`998`	`998`
`999`		`- Assert(!am_bg_writer);`
	`999`	`+ if (am_bg_writer)`
	`1000`	`+ elog(ERROR, "ForwardFsyncRequest must not be called in bgwriter");`
`1000`	`1001`
`1001`	`1002`	`LWLockAcquire(BgWriterCommLock, LW_EXCLUSIVE);`
`1002`	`1003`