Commite0b581a

committed

Send all outstanding WAL before exiting when smart shutdown is requested.

This was broken by my previous patch to send WAL in smaller batches.Patch by Fujii Masao.

1 parentbc0f080 commite0b581aCopy full SHA for e0b581a

File tree

-4

lines changed

-4

lines changed

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`*`
`31`	`31`	`*`
`32`	`32`	`* IDENTIFICATION`
`33`		`- * $PostgreSQL: pgsql/src/backend/replication/walsender.c,v 1.22 2010/05/26 22:34:49 heikki Exp $`
	`33`	`+ * $PostgreSQL: pgsql/src/backend/replication/walsender.c,v 1.23 2010/05/31 10:44:37 heikki Exp $`
`34`	`34`	`*`
`35`	`35`	`*-------------------------------------------------------------------------`
`36`	`36`	`*/`
`@@ -394,8 +394,10 @@ WalSndLoop(void)`
`394`	`394`	`*/`
`395`	`395`	`if (ready_to_stop)`
`396`	`396`	`{`
`397`		`-XLogSend(&output_message,&caughtup);`
`398`		`-shutdown_requested= true;`
	`397`	`+if (!XLogSend(&output_message,&caughtup))`
	`398`	`+gotoeof;`
	`399`	`+if (caughtup)`
	`400`	`+shutdown_requested= true;`
`399`	`401`	`}`
`400`	`402`
`401`	`403`	`/* Normal exit from the walsender is here */`
`@@ -458,7 +460,6 @@ WalSndLoop(void)`
`458`	`460`	`staticvoid`
`459`	`461`	`InitWalSnd(void)`
`460`	`462`	`{`
`461`		`-/* use volatile pointer to prevent code rearrangement */`
`462`	`463`	`inti;`
`463`	`464`
`464`	`465`	`/*`
`@@ -474,6 +475,7 @@ InitWalSnd(void)`
`474`	`475`	`*/`
`475`	`476`	`for (i=0;i<max_wal_senders;i++)`
`476`	`477`	`{`
	`478`	`+/* use volatile pointer to prevent code rearrangement */`
`477`	`479`	`volatileWalSnd*walsnd=&WalSndCtl->walsnds[i];`
`478`	`480`
`479`	`481`	`SpinLockAcquire(&walsnd->mutex);`

Comments

(0)