rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WAL receiver shouldn't try to send a reply when dying. 

Per report from, and discussion with, Fujii Masao.
This commit is contained in:
Robert Haas 2011-02-16 10:24:50 -05:00
parent 6e02755b22
commit 3a087369c0
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/backend/replication/walreceiver.c
View File

@ -118,7 +118,7 @@ static void DisableWalRcvImmediateExit(void);
static void WalRcvDie(int code, Datum arg); static void WalRcvDie(int code, Datum arg);
static void XLogWalRcvProcessMsg(unsigned char type, char *buf, Size len); static void XLogWalRcvProcessMsg(unsigned char type, char *buf, Size len);
static void XLogWalRcvWrite(char *buf, Size nbytes, XLogRecPtr recptr); static void XLogWalRcvWrite(char *buf, Size nbytes, XLogRecPtr recptr);
static void XLogWalRcvFlush(void); static void XLogWalRcvFlush(bool dying);
static void XLogWalRcvSendReply(void); static void XLogWalRcvSendReply(void);
/* Signal handlers */ /* Signal handlers */
@ -319,7 +319,7 @@ WalReceiverMain(void)
* If we've written some records, flush them to disk and let the * If we've written some records, flush them to disk and let the
* startup process know about them. * startup process know about them.
*/ */
XLogWalRcvFlush(); XLogWalRcvFlush(false);
} }
else else
{ {
@ -342,7 +342,7 @@ WalRcvDie(int code, Datum arg)
volatile WalRcvData *walrcv = WalRcv; volatile WalRcvData *walrcv = WalRcv;
/* Ensure that all WAL records received are flushed to disk */ /* Ensure that all WAL records received are flushed to disk */
XLogWalRcvFlush(); XLogWalRcvFlush(true);
SpinLockAcquire(&walrcv->mutex); SpinLockAcquire(&walrcv->mutex);
Assert(walrcv->walRcvState == WALRCV_RUNNING || Assert(walrcv->walRcvState == WALRCV_RUNNING ||
@ -461,7 +461,7 @@ XLogWalRcvWrite(char *buf, Size nbytes, XLogRecPtr recptr)
*/ */
if (recvFile >= 0) if (recvFile >= 0)
{ {
XLogWalRcvFlush(); XLogWalRcvFlush(false);
/* /*
* XLOG segment files will be re-read by recovery in startup * XLOG segment files will be re-read by recovery in startup
@ -531,9 +531,14 @@ XLogWalRcvWrite(char *buf, Size nbytes, XLogRecPtr recptr)
} }
} }
/* Flush the log to disk */ /*
* Flush the log to disk.
*
* If we're in the midst of dying, it's unwise to do anything that might throw
* an error, so we skip sending a reply in that case.
*/
static void static void
XLogWalRcvFlush(void) XLogWalRcvFlush(bool dying)
{ {
if (XLByteLT(LogstreamResult.Flush, LogstreamResult.Write)) if (XLByteLT(LogstreamResult.Flush, LogstreamResult.Write))
{ {
@ -565,7 +570,8 @@ XLogWalRcvFlush(void)
} }
/* Also let the master know that we made some progress */ /* Also let the master know that we made some progress */
XLogWalRcvSendReply(); if (!dying)
XLogWalRcvSendReply();
} }
} }