From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Thu, 4 Oct 2007 15:37:44 +0000 (+0000)
Subject: Change Assert() to a plain test and elog, just to see if that works
X-Git-Tag: REL9_0_0~4873
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b26738b58344226e8394c4c001a53cfe53336be2;p=pg-rex%2Fsyncrep.git

Change Assert() to a plain test and elog, just to see if that works
around the icc bug exhibited by buildfarm member dugong.
---

diff --git a/src/backend/postmaster/bgwriter.c b/src/backend/postmaster/bgwriter.c
index fc649df0d1..c0a7616233 100644
--- 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);