|
|
|
@ -3107,12 +3107,7 @@ PgstatCollectorMain(int argc, char *argv[]) |
|
|
|
|
* satisfied by existing file. |
|
|
|
|
*/ |
|
|
|
|
if (last_statwrite < last_statrequest) |
|
|
|
|
{ |
|
|
|
|
elog(LOG, "pgstat: writing new stats file"); |
|
|
|
|
pgstat_write_statsfile(false); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
elog(LOG, "pgstat: attempting recv()"); |
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Try to receive and process a message. This will not block, |
|
|
|
@ -3141,9 +3136,6 @@ PgstatCollectorMain(int argc, char *argv[]) |
|
|
|
|
errmsg("could not read statistics message: %m"))); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
elog(LOG, "pgstat: received msg type %d len %d", |
|
|
|
|
msg.msg_hdr.m_type, len); |
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* We ignore messages that are smaller than our common header |
|
|
|
|
*/ |
|
|
|
@ -3238,8 +3230,6 @@ PgstatCollectorMain(int argc, char *argv[]) |
|
|
|
|
} |
|
|
|
|
} /* end of inner message-processing loop */ |
|
|
|
|
|
|
|
|
|
elog(LOG, "pgstat: waiting"); |
|
|
|
|
|
|
|
|
|
/* Sleep until there's something to do */ |
|
|
|
|
/* XXX should not need a timeout here */ |
|
|
|
|
wr = WaitLatchOrSocket(&pgStatLatch, |
|
|
|
@ -3247,8 +3237,6 @@ PgstatCollectorMain(int argc, char *argv[]) |
|
|
|
|
pgStatSock, |
|
|
|
|
2000L); |
|
|
|
|
|
|
|
|
|
elog(LOG, "pgstat: wait result 0x%x", wr); |
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Emergency bailout if postmaster has died. This is to avoid the |
|
|
|
|
* necessity for manual cleanup of all postmaster children. |
|
|
|
@ -4031,15 +4019,7 @@ static void |
|
|
|
|
pgstat_recv_inquiry(PgStat_MsgInquiry *msg, int len) |
|
|
|
|
{ |
|
|
|
|
if (msg->inquiry_time > last_statrequest) |
|
|
|
|
{ |
|
|
|
|
last_statrequest = msg->inquiry_time; |
|
|
|
|
if (last_statwrite < last_statrequest) |
|
|
|
|
elog(LOG, "pgstat: received new inquiry message"); |
|
|
|
|
else |
|
|
|
|
elog(LOG, "pgstat: received stale inquiry message"); |
|
|
|
|
} |
|
|
|
|
else |
|
|
|
|
elog(LOG, "pgstat: received out-of-order inquiry message"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|