postgres.git / summary / log / commit / refs

commit    d461d0502b6e20c6d4ec326ba2faec8212fd5dee
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Mon May 14 19:03:14 2012 +0000
First released in: 9.2.0

    For testing purposes, reinsert a timeout in pgstat.c's wait call.
    
    Test results from buildfarm members mastodon/narwhal (Windows Server 2003)
    make it look like that platform just plain loses FD_READ events
    occasionally, and the only reason our previous coding seemed to work was
    that it timed out every couple of seconds and retried the whole operation.
    Try to verify this by reinserting a finite timeout into the pgstat loop.
    This isn't meant to be a permanent patch either, just to confirm or
    disprove a theory.


 src/backend/postmaster/pgstat.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c
index 4c2cc655723..a7ca8cd60d7 100644
--- a/src/backend/postmaster/pgstat.c
+++ b/src/backend/postmaster/pgstat.c
@@ -3241,10 +3241,11 @@ PgstatCollectorMain(int argc, char *argv[])
 		elog(LOG, "pgstat: waiting");
 
 		/* Sleep until there's something to do */
+		/* XXX should not need a timeout here */
 		wr = WaitLatchOrSocket(&pgStatLatch,
-							   WL_LATCH_SET | WL_POSTMASTER_DEATH | WL_SOCKET_READABLE,
+							   WL_LATCH_SET | WL_POSTMASTER_DEATH | WL_SOCKET_READABLE | WL_TIMEOUT,
 							   pgStatSock,
-							   -1L);
+							   2000L);
 
 		elog(LOG, "pgstat: wait result 0x%x", wr);
 


[parent: f1ca51549e9e]